Trying to fix server-side bug