Retry fixing mdo handling