Fix for addressing mode base value getting clobbered by scale value