fix some codes