Add temporary fix to plugin side-effect