added mapping fixer