Bugfix Torch