Fix previous refactor