fix some code2