Hotfix to YASP-126