Fix issue in notifications