correct PC17 handling even more