pn-c2-22 #1679