Fix order issue