fix bug
fix all bug