Fix for CRM-12428
Merge pull request #564 from deepak-srivastava/hulk

Fix for CRM-12428