Bug fixed and ATC on map!