Ensure setting order when order number is changed