Fix Address bug