Fixed notificatications