Critical patch for the server module