Bug-fix:

 - Improper mapping during mismatches