fixed reverse mapping