notice fix
Merge pull request #1594 from yashodha/notice-fixes

notice fix