Event remove fix