Fix pf for null-term strings