Change where the fake server check is done in the system