Fixes #23 Duplicate notifications