bug fix take 325