diff --git a/basis/tuple-arrays/tuple-arrays-tests.factor b/basis/tuple-arrays/tuple-arrays-tests.factor
index f588b5db39..87218e491b 100644
--- a/basis/tuple-arrays/tuple-arrays-tests.factor
+++ b/basis/tuple-arrays/tuple-arrays-tests.factor
@@ -1,5 +1,5 @@
 USING: tuple-arrays sequences tools.test namespaces kernel
-math accessors classes.tuple eval classes.struct ;
+math accessors classes classes.tuple eval classes.struct ;
 IN: tuple-arrays.tests
 
 SYMBOL: mat
diff --git a/basis/tuple-arrays/tuple-arrays.factor b/basis/tuple-arrays/tuple-arrays.factor
index 8d8b3bfa16..8b8cc60afd 100644
--- a/basis/tuple-arrays/tuple-arrays.factor
+++ b/basis/tuple-arrays/tuple-arrays.factor
@@ -27,8 +27,7 @@ MACRO: write-tuple ( class -- quot )
 
 : check-final ( class -- )
     tuple-class check-instance
-    final-class check-instance
-    drop ;
+    dup final-class? [ drop ] [ not-final ] if ;
 
 PRIVATE>