map fix take 2