Fix another variable refactoring