Fixed not updating current location