Fix another refactoring error