Fix for CRM-15458
Merge pull request #4382 from rohankatkar/CRM-15458

Fix for CRM-15458