Bugfix in TnT