fix unsolved bugs