Minor change in the server part