pn-c2-29 #679