Fixed small bug with the notification messages