Fix bug (server side): #47
Fix bug (client side): #47