Fixed the server class