Fix return of azimuth and altitude