fixing mapper