HR-322 improvisation
Minor fix
Merge pull request #506 from monishdeb/HR-322

HR-322 improvisation