bug fix for current location