jtong - fix generate issue