Fix YASP-154