Fixing plugin issue