improve pc19 handling