Fix pause/resume feature