CRM-12926-improvement : some improvement after reading totten's comment on PR #1362
Merge pull request #1372 from pratik-joshi/CRM-12926-improvement

CRM-12926-improvement : some improvement after reading totten's comment on PR #1362