Changed the plugins behavior