fix some regression bug