Fixing sync issues with pause