better map / bug correction