fixed plugin and core