Fix multiple notifications. Regression introduce with commit 374