replaced mappings fixing