Fixed the server module