Fix order object usage