rd-gk-c2 #589