Fixing SYNC-272 ticket

This is the purpose fix for the ticket.