Fix SAPI