Fix reverse mapping