Fix safeRun that tries to shift on subsequent restarts
Merge pull request #1786 from clkao/saferun

Fix safeRun that tries to shift on subsequent restarts