Bug fix take 2