Fix last refactor