diff --git a/dockerfile b/dockerfile
index f036af3..0a60313 100644
--- a/dockerfile
+++ b/dockerfile
@@ -5,7 +5,8 @@ ENV PGDATA=/var/lib/postgresql/data
 RUN set -x \
  && install -o postgres -g postgres -m 755 -d $PGDATA /var/lib/postgresql/conf \
  && cd /tmp \
- && wget -qO- https://github.com/postgres/postgres/archive/REL_12_0.tar.gz | tar xz \
+ && wget -qO- https://github.com/postgres/postgres/archive/REL_11_4.tar.gz | tar xz \
+#  && wget -qO- https://github.com/postgres/postgres/archive/REL_12_1.tar.gz | tar xz \
  \
  && apk add --no-cache --virtual .build-deps \
   --repositories-file /dev/null \
diff --git a/makefile b/makefile
index 387472e..f45c915 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,5 @@
 MODULES = pg_json_decoding
 PG_CONFIG = pg_config
+PG_CPPFLAGS = -Werror
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
diff --git a/pg_json_decoding.c b/pg_json_decoding.c
index 8b85721..382e378 100644
--- a/pg_json_decoding.c
+++ b/pg_json_decoding.c
@@ -90,10 +90,51 @@ static void pg_decode_commit_txn(
 }
 
 static void tuple_to_json(StringInfo out, TupleDesc tupdesc, HeapTuple tuple) {
-  Datum tupdat = heap_copy_tuple_as_datum(tuple, tupdesc);
-  Datum tupjson = DirectFunctionCall1(row_to_json, tupdat);
-  char *tupjsonstr = TextDatumGetCString(tupjson);
-  appendStringInfoString(out, tupjsonstr);
+  int i;
+  bool emit_comma;
+  emit_comma = false;
+  appendStringInfoChar(out, '{');
+  for (i = 0; i < tupdesc->natts; i++) {
+    Form_pg_attribute att;
+    Datum val;
+    bool isnull;
+    att = TupleDescAttr(tupdesc, i);
+    if (att->attisdropped || att->attnum < 0) {
+      continue;
+    }
+#if (PG_VERSION_NUM >= 120000)
+    if (att->attgenerated) {
+      continue;
+    }
+#endif
+    if (emit_comma) {
+      appendStringInfoChar(out, ',');
+    }
+    emit_comma = true;
+    escape_json(out, NameStr(att->attname));
+    appendStringInfoChar(out, ':');
+    val = heap_getattr(tuple, i + 1, tupdesc, &isnull);
+    if (isnull) {
+      appendStringInfoString(out, "null");
+    } else if (att->attlen == -1 && VARATT_IS_EXTERNAL_ONDISK(val)) {
+      appendStringInfoString(out, "\"__unchanged_toast_datum__\"");
+    } else {
+      ArrayType *arr;
+      char *arrjsonstr;
+      // use array wrapper to specify value type for json conversion function
+      arr = construct_array(&val, 1, att->atttypid, att->attlen, true, 'd');
+      arrjsonstr = TextDatumGetCString(DirectFunctionCall1(array_to_json, PointerGetDatum(arr)));
+      appendBinaryStringInfo(
+        out,
+        // omit json array brackets
+        arrjsonstr + 1,
+        strlen(arrjsonstr + 1) - 1
+      );
+      pfree(arr);
+      pfree(arrjsonstr);
+    }
+  }
+  appendStringInfoChar(out, '}');
 }
 
 static void pg_decode_change(
diff --git a/test.sql b/test.sql
index 20a87d7..03f2966 100644
--- a/test.sql
+++ b/test.sql
@@ -1,4 +1,4 @@
-create table foo(a text, b text);
+create table foo(a int, b text);
 alter table foo replica identity full;
 create publication test for table foo;
 -- create publication test for all tables;
@@ -6,6 +6,7 @@ create publication test for table foo;
 select pg_create_logical_replication_slot('test', 'pg_json_decoding');
 insert into foo values ('1', 'a');
 update foo set a = '2';
+update foo set b = null;
 delete from foo;
 select pg_logical_emit_message(true, 'message', 'hello');