Fixes pause/resume