Bugfix
Improved notifications