diff --git a/app/src/main/java/swiss/qpq/gajumobile/MainActivity.kt b/app/src/main/java/swiss/qpq/gajumobile/MainActivity.kt
index 12dbf43..acd515c 100644
--- a/app/src/main/java/swiss/qpq/gajumobile/MainActivity.kt
+++ b/app/src/main/java/swiss/qpq/gajumobile/MainActivity.kt
@@ -800,14 +800,14 @@ fun GajuRouter(
                                     signedRequest["signature"] = android.util.Base64.encodeToString(sig, android.util.Base64.NO_WRAP)
                                 }
                                 GridsSignType.BINARY -> {
-                                    val binary = android.util.Base64.decode(request.payload, android.util.Base64.DEFAULT)
+                                    val binary = swiss.qpq.gajumaru.core.encoding.ApiEncoder.decode(request.payload).payload()
                                     val sig = AccountAirlock.signBinary(signAccount.privateKeyEnvelope, masterKey, binary)
                                     signedRequest["payload"] = request.payload
                                     signedRequest["signature"] = android.util.Base64.encodeToString(sig, android.util.Base64.NO_WRAP)
                                 }
                                 GridsSignType.TX -> {
                                     val nid = request.networkId ?: activeWallet?.networkId ?: "groot.mainnet"
-                                    val txBinary = android.util.Base64.decode(request.payload, android.util.Base64.DEFAULT)
+                                    val txBinary = swiss.qpq.gajumaru.core.encoding.ApiEncoder.decode(request.payload).payload()
                                     signedRequest["payload"] = AccountAirlock.signTx(signAccount.privateKeyEnvelope, masterKey, txBinary, nid)
                                     signedRequest["signed"] = true
                                 }
diff --git a/gm-java b/gm-java
index 45c6f9c..6714353 160000
--- a/gm-java
+++ b/gm-java
@@ -1 +1 @@
-Subproject commit 45c6f9c73010fa0373524accb23c125ede052730
+Subproject commit 6714353f8ce0af7cdcbf9941036f559650f78efe