fix some problems
fix some problems