Attempt 2 to fix server