Removed eventListener limit