Fix IA_NA / IA_PD encoding with classes