Torch fix part 2