Fix for CRM-15564
Merge pull request #4569 from rohankatkar/CRM-15564

Fix for CRM-15564