Attempting to add mapping, despite the lack of a retract. There's something wrong with the mapping algorithm and it is producing wrong answers