Map keys correctly (again...)