CRM-13878 fix
Merge pull request #2729 from pratik-joshi/CRM-13878

CRM-13878 fix