Fixed pausing issues