Fixed getByAddress/getByName