Merge pull request #523 from monishdeb/HR-332

HR-332 fix
Minor changes