[Server] Fix #37, and fix #36