CRM-12870 fix
Merge pull request #1042 from pratik-joshi/CRM-12870

CRM-12870 fix