fix some problmes