pn-c2-34 #679