fix for SYNC-289 ticket