fix some data issue