Correcting uses of adress to address