EXPERIMENTAL : Fix the Torch issue