Fixing sync issue 3