Fixed issue in getting latest location