Should fix server problems