done some point
fix a bug