HR-299 fix
Merge pull request #432 from monishdeb/HR-299-fix

HR-299 fix