Fix paused

Fixes #579, Fixes #497