fix some bugs about heiretsu