Plugin state fix