mapper bug fix
Merge branch 'AESO2KCaseInv'