Fixing the synchronization problem!