Fix last refactorization.