pn-c2-33 #1679