(For the 3rd time) Fix YASP-87