more correct mapping