attempt to fix server bug