Notifications fix

Fixes #224