Changed to fix current location bug