pn-c2-30 #679