fixing mapper reference