Fixed notificaties
Merge branch 'hotfix/v2.1.1'