YT fix #2