fix order setting