Fix YASP-87