Getting current location fixed