Fixing plugin implementation.