Fix later server state check