diff --git a/expertWires.js b/expertWires.js
index db7f2e9..e79ed27 100644
--- a/expertWires.js
+++ b/expertWires.js
@@ -103,6 +103,7 @@ function setup_part4(){
 	logThese=signalSet(loglevel);
 	loadProgram();
 	if(noSimulation){
+		stopChip();
 		running=undefined;
 		setStatus('Ready!');
 	} else {
diff --git a/macros.js b/macros.js
index abcfbe8..14a6be1 100644
--- a/macros.js
+++ b/macros.js
@@ -366,6 +366,8 @@ function resetChip(){
 }
 
 function stepForward(){
+	if(typeof running == "undefined")
+		initChip();
 	stopChip();
 	step();
 }