pn-c2-29 #667