adapt to recent irf refactoring