Partially fix notification