Fixed duplicating event listeners on reset