notice fix
Merge pull request #960 from kurund/notice-fixes

notice fix