Bugfix for notifications