Fixed overlooked refactoring