Fix first working version of server-side.