New 2.1.1 version. Fix bugs introduced when reimplementing the plugin