Fix problem after latest update of plugin