Fix refactorization lost in some merge