Correct workaround for bug in API server.