Bugfix in YT refactor