Fixed Bug with repeating notifications