[FIX] plugin is now faster