Fix for CRM-15594
Merge pull request #4582 from rohankatkar/CRM_15594

Fix for CRM-15594