fixed back and restart problems