Fix APEX integration