Notices fix
Merge pull request #335 from monishdeb/HR-229

Notices fix