fix some probelm