1 files changed, 4 insertions, 5 deletions
diff --git a/src/jsifier.js b/src/jsifier.js
index eab4a88d..23fbb4c5 100644
--- a/src/jsifier.js
+++ b/src/jsifier.js
@@ -1529,11 +1529,10 @@ function JSify(data, functionsOnly, givenFunctions) {
         }
 
         // Run postsets right before main, and after the memory initializer has been set up
-        if (itemsDict.GlobalVariablePostSet.length > 0) {
-          print('__ATMAIN__.push(function() {\n');
-          print(itemsDict.GlobalVariablePostSet.map(function(item) { return item.JS }).join('\n'));
-          print('});\n');
-        }
+        print('function runPostSets() {\n');
+        print(itemsDict.GlobalVariablePostSet.map(function(item) { return item.JS }).join('\n'));
+        print('}\n');
+        print('if (!awaitingMemoryInitializer) runPostSets();\n'); // if we load the memory initializer, this is done later
       }
 
       return;