[Server] Fix #69