Ensure event handlers are set after removing them :)