Server -> ServerCommand fix