Attempt to fix multiple notification problem