Correct bug in notice handling