Fixed bug with once event handlers not being removed