Fix Change between local and non-local server