Bug fix + always instantiate in paint context when the plugin can paint