Fix refactoring issue