bug repeat emit notifications fixed