Trying to fix server issue