pn-c2-28 #669