Fix address tag