diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
index f939ae004..5a94d0e0e 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindablePropertyJsonUpdate.java
@@ -31,8 +31,7 @@ class BindablePropertyJsonUpdate extends BindableProperty {
       final MutableValueInfo hash = prop.createMutableInfo(json);
       bean._ebean_getIntercept().mutableInfo(propertyIndex, hash);
       request.pushJson(json);
-      final Object value = prop.getValue(bean);
-      request.bind(value, prop);
+      request.bind(prop.getValue(bean), prop);
     }
   }
 }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
index 78ceb098b..d5c59daf3 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryProperty.java
@@ -2,6 +2,7 @@ package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
+import io.ebeaninternal.server.deploy.BeanPropertyJsonMapper;
 import io.ebeaninternal.server.persist.dml.DmlMode;
 
 /**
@@ -23,14 +24,12 @@ class FactoryProperty {
    * Create a Bindable for the property given the mode and withLobs flag.
    */
   public Bindable create(BeanProperty prop, DmlMode mode, boolean withLobs, boolean allowManyToOne) {
-
     if (DmlMode.INSERT == mode && !prop.isDbInsertable()) {
       return null;
     }
     if (DmlMode.UPDATE == mode && !prop.isDbUpdatable()) {
       return null;
     }
-
     if (prop.isLob() && !withLobs) {
       // Lob exclusion
       return null;
@@ -38,12 +37,10 @@ class FactoryProperty {
     if (prop.isDbEncrypted()){
       return new BindableEncryptedProperty(prop, bindEncryptDataFirst);
     }
-
     if (allowManyToOne && prop instanceof BeanPropertyAssocOne) {
       return  new BindableAssocOne((BeanPropertyAssocOne<?>)prop);
     }
-
-    if (prop.getScalarType().isJsonMapper()) {
+    if (prop instanceof BeanPropertyJsonMapper) {
       if (DmlMode.INSERT == mode) {
         return new BindablePropertyJsonInsert(prop);
       } else if (DmlMode.UPDATE == mode) {