Fixing sync issue