Fixed with a new plugin system