Also fix in the plugin