Fixed formatted address issue