Tried to fix server sorting