Hack patch for MBO usage