Fix, improve location detection.