pn-c2-33 #588