-fixed for CRM-12017
Merge pull request #60 from pradpnayak/CRM-12017

-fixed for CRM-12017