Fix destination handler.