Fix addr problem