This fixes #21

Fixes notification loop that occurs in specific conditions