FIXED: issues with notification error