pn-c2-24 #1636