Fixed bug with notices