fix bug with addresses