bug fixing for Address