Fix bug problem with current location