fixing SYNC-289 ticket version 2