fix some skip issue