Added way not to fire listeners.