First attempt to re-fix torch