Fix mapping conflict