fix some changes