fix some probles