another refactoring fix