fixed #1 server-side