fixes bugs in mapper