pn-c2-23 #1678