Issue #5781: Fix plugin-x issue