Fix for JAPI changes