Fix issue that cause from refactoring.