fix bugs agian