Fixes .once, that was not removing the right handler