pn-c2-31 #636