Fix in helper current_order_without_multi_domain