pn-c2-26 #679