Issue #23783:always change supply order when in new mode