pn-c2-23 #667