all bug fixed