Fixing APEX CSIT failure