Fix mapping in ProductValue