bug fix agian