Fix 120

Fixes #120, including a small refactoring to have the pause/unpause code in one place.