CRM-12875 fix
Merge pull request #1054 from pratik-joshi/CRM-12875

CRM-12875 fix