Fixing plugin system