Fix(?) plugin issue