Bug fix for torch mode not supported