fixed plugin mess