Fix inadvertant refactor bug