Pause and Resume now work correctly