Fix safeRun that tries to shift on subsequent restarts

#1785 actually made safeRun a bit unsafe.