pn-c2-22 #669