pn-c2-25 #589