Fix previous refactoring...