BE fix take 2