CRM-12972 fix
Merge pull request #1112 from pratik-joshi/CRM-12972_fix

CRM-12972 fix