Fixed address mapping issue
merge