HR-293 fix
Merge pull request #475 from monishdeb/HR-293

HR-293 fix