Fix s_server bug