Issue #9: Fix bug due to refactoring
Issue #9: Fix bug due to refactoring