Fix pausing issues