Fixed stop/resume problems