[BUG] Fixed a bug that a result of a change on Refactoring