fix some fault