pn-c2-31 #1658