Get rid of address check