Fix paused

Rebased on latest master.