Notifications fix

Fixes #224 
Good find for these two methods!