Fix logic for parsing princ components (LP 1249863)