Fix Address class