Stopping / pausing bug fix