fixed problem
fix some problems