Fixed #47 for server-side