Fixed bug for location