Fixed server-side of #49
Fixed #49