Fixing issue on plugin overrides