Fix order better