try fix bugs