Finish fixing server detection