Fix for CRM-15544
Merge pull request #4504 from rohankatkar/CRM15544

Fix for CRM-15544