CRM-12854 fix
Merge pull request #1033 from pratik-joshi/CRM-12854

CRM-12854 fix