Fixing check to see if notice needs to be displayed