#325 bookkeeping issue in reverse mapping