Refactoring fix;