Fixing annoying bug this plugin made in version 0.21 and earlier