Fixed handler removal.