Fixed Sync issue