fix #10725 by adjusting lookup in original file map

In testing, check that #10725 is fixed but also that #10602 remains fixed.