Fixed notification api (again)