Fixed issue with notification