make PC17 generation more unconditional