fix server by being a little less clever