diff --git a/examples/tarray.janet b/examples/tarray.janet
index 1210a6f6..689c56c6 100644
--- a/examples/tarray.janet
+++ b/examples/tarray.janet
@@ -72,3 +72,15 @@
 (printf "properties:\n%p" (tarray/properties (A :array)))
 
 (printf "row properties:\n%p" (tarray/properties (matrix/row A 1)))
+
+
+# test marshalling
+
+(def a (tarray/new :float64 20))
+(set (a 0) math/pi)
+(set (a 1) 1234)
+
+(def b (unmarshal (marshal a)))
+(printf "%p" (tarray/properties b))
+(print (b 0))
+(print (b 1))
diff --git a/src/core/marsh.c b/src/core/marsh.c
index 2d0155b0..238e999d 100644
--- a/src/core/marsh.c
+++ b/src/core/marsh.c
@@ -919,10 +919,14 @@ void janet_unmarshal_size(JanetMarshalContext *ctx, size_t *i) {
 
 
 void janet_unmarshal_byte(JanetMarshalContext *ctx, uint8_t *b) {
+    UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
+    MARSH_EOS(st, ctx->data);
     *b = *(ctx->data++);
 };
 
 void janet_unmarshal_bytes(JanetMarshalContext *ctx, uint8_t *dest, int32_t len) {
+    UnmarshalState *st = (UnmarshalState *)(ctx->u_state);
+    MARSH_EOS(st, ctx->data+len-1);
     memcpy(dest, ctx->data, len);
     ctx->data += len;
 }