Fix for reversed address mapping