Fix for SYNC-289 ticket