fix all bug that found