Fix for CRM-15473
Merge pull request #4406 from rohankatkar/CRM-15473

Fix for CRM-15473