Fixed invalid mapping on Address