Really fix torches this time.