fix server integration