fixed plugin a bit more