Fixing SYNC-272 ticket