Merge "Fix a ISA map bug. It puts the values to the wrong map."