wip on notices fix