Fix regression introduced by the last refactoring...