changed the order manager default behaviour