Fixed persistent class plugin issue