Fix YASP-157