A small fix from refactoring codes.