fix type order