Fixing sync issue 1