Minor refactoring fix