Support p6p1 too.