fixed plugin issues