fixed map (again)