1 files changed, 7 insertions, 1 deletions
diff --git a/src/library.js b/src/library.js
index cf28a73c..e0a38817 100644
--- a/src/library.js
+++ b/src/library.js
@@ -3481,11 +3481,17 @@ LibraryManager.library = {
       ___setErrNo(ERRNO_CODES.ERANGE);
     }
 
+#if USE_TYPED_ARRAYS == 2
+    if (bits == 64) {
+      ret = [{{{ splitI64('ret') }}}];
+    }
+#else
 #if I64_MODE == 1
     if (bits == 64) {
       ret = {{{ splitI64('ret') }}};
     }
 #endif
+#endif
 
     return ret;
   },
@@ -4377,7 +4383,7 @@ LibraryManager.library = {
     ptrTV -= {{{ Runtime.QUANTUM_SIZE }}};
     var TI = {{{ makeGetValue('ptrTV', '0', '*') }}};
     do {
-      if (TI == attemptedTI) return 1;
+      if (TI == attemptedTI) return ptr;
       // Go to parent class
       var type_infoAddr = {{{ makeGetValue('TI', '0', '*') }}} - {{{ Runtime.QUANTUM_SIZE*2 }}};
       var type_info = {{{ makeGetValue('type_infoAddr', '0', '*') }}};