Improve pause behavior
Fix issue with unpausing