Fixing switching order.