Updated the server-side code fix #67