try to make refactoring participants more robust