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

notice fix