Patchwork to avoid plugin problems