Refactoring fix