Improve plugin shim. close #594