Fix for CRM-12359
Merge pull request #447 from deepak-srivastava/crm43

Fix for CRM-12359