diff --git a/skeletons/OCTET_STRING_jer.c b/skeletons/OCTET_STRING_jer.c
index 19b4fc314..d744cc3e3 100644
--- a/skeletons/OCTET_STRING_jer.c
+++ b/skeletons/OCTET_STRING_jer.c
@@ -30,22 +30,19 @@ OCTET_STRING_encode_jer(const asn_TYPE_descriptor_t *td, const void *sptr,
      */
     buf = st->buf;
     end = buf + st->size;
+    ASN__CALLBACK("\"", 1);
     for(i = 0; buf < end; buf++, i++) {
       if(!(i % 16) && (i || st->size > 16)) {
         ASN__CALLBACK(scratch, p-scratch);
         p = scratch;
-        ASN__TEXT_INDENT(1, ilevel);
       }
       *p++ = h2c[(*buf >> 4) & 0x0F];
       *p++ = h2c[*buf & 0x0F];
-      *p++ = 0x20;
     }
     if(p - scratch) {
-      p--;  /* Remove the tail space */
-      ASN__CALLBACK3("\"", 1, scratch, p-scratch, "\"", 1);  /* Dump the rest */
-      if(st->size > 16)
-        ASN__TEXT_INDENT(1, ilevel-1);
+      ASN__CALLBACK(scratch, p-scratch);  /* Dump the rest */
     }
+    ASN__CALLBACK("\"", 1);
 
     ASN__ENCODED_OK(er);
 cb_failed: