Notice fix part 2

* Fixed to work like it did previously.