Mapping fix for explicit defined index types