Fixed mdo handling