[Server] Attempt to fix #49