fixing extra notifies