Fixed a bug related to previous refactoring