Pause/Resume work a little bit better now