improve pc17 handling