Fixed notice being sometimes shown twice