fix all bug