added plugin avoiding take 2