Fixed stupid mistake in previous refactoring