fix issue with notification generation