fix server methods