diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
index 9491071..315bf25 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgResultSet.java
@@ -2210,7 +2210,17 @@ public class PgResultSet implements ResultSet, org.postgresql.PGRefCursorResultS
     if (connection.getBitToString()) {
       return val;
     }
-    return BooleanTypeUtil.castToBoolean(val);
+
+    Field field = this.fields[columnIndex - 1];
+    if (field.getMod() == 1 || !isDolphin()) {
+      return BooleanTypeUtil.castToBoolean(val);
+    }
+
+    return this.getBytes(columnIndex);
+  }
+
+  public static boolean isDolphin() {
+    return "B".equals(TypeInfoCache.getSqlCompatibility()) && "on".equals(TypeInfoCache.getDolphinMode());
   }
 
   private static final BigInteger BYTEMAX = new BigInteger(Byte.toString(Byte.MAX_VALUE));
diff --git a/pgjdbc/src/test/java/org/postgresql/test/dolphintest/BitTest.java b/pgjdbc/src/test/java/org/postgresql/test/dolphintest/BitTest.java
new file mode 100644
index 0000000..2bb8f59
--- /dev/null
+++ b/pgjdbc/src/test/java/org/postgresql/test/dolphintest/BitTest.java
@@ -0,0 +1,43 @@
+package org.postgresql.test.dolphintest;
+
+import org.junit.Test;
+import org.postgresql.test.TestUtil;
+import org.postgresql.test.jdbc2.BaseTest4B;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class BitTest extends BaseTest4B {
+    /*
+     * Tests bit type
+     */
+    @Test
+    public void testBit() throws Exception {
+        TestUtil.createTable(con, "test_bit", "c1 bit(1),c2 bit(10),c3 bit(6)");
+
+        PreparedStatement pstmt = con.prepareStatement("INSERT INTO test_bit VALUES (1, 12.569, 8.753)");
+        pstmt.executeUpdate();
+
+        Statement stmt = con.createStatement();
+        ResultSet rs = stmt.executeQuery("SELECT c1,c2,c3 FROM test_bit");
+
+        assertTrue(rs.next());
+        Object o1 = rs.getObject(1);
+        assertNotNull(o1);
+        assertEquals(true, o1);
+
+        String o2 = rs.getObject(2).getClass().toString();
+        assertNotNull(o2);
+        assertEquals("class [B", o2);
+
+        String o3 = rs.getObject(3).getClass().toString();
+        assertNotNull(o3);
+        assertEquals("class [B", o3);
+        TestUtil.dropTable(con, "test_bit");
+    }
+}
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BitTest.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BitTest.java
new file mode 100644
index 0000000..ec53561
--- /dev/null
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc4/BitTest.java
@@ -0,0 +1,43 @@
+package org.postgresql.test.jdbc4;
+
+import org.junit.Test;
+import org.postgresql.test.TestUtil;
+import org.postgresql.test.jdbc2.BaseTest4;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class BitTest extends BaseTest4 {
+    /*
+     * Tests bit type
+     */
+    @Test
+    public void testBit() throws Exception {
+        TestUtil.createTable(con, "test_bit", "c1 bit(1),c2 bit(10),c3 bit(6)");
+
+        PreparedStatement pstmt = con.prepareStatement("INSERT INTO test_bit VALUES (0::bit(1), 1234::bit(10), 88::bit(6))");
+        pstmt.executeUpdate();
+
+        Statement stmt = con.createStatement();
+        ResultSet rs = stmt.executeQuery("SELECT c1,c2,c3 FROM test_bit");
+
+        assertTrue(rs.next());
+        Object o1 = rs.getObject(1);
+        assertNotNull(o1);
+        assertEquals(false, o1);
+
+        Object o2 = rs.getObject(2);
+        assertNotNull(o2);
+        assertEquals(true, o2);
+
+        Object o3 = rs.getObject(3);
+        assertNotNull(o3);
+        assertEquals(true, o3);
+        TestUtil.dropTable(con, "test_bit");
+    }
+}