Fix mapping while #1572 not completed