try fix some codes