APEX: Fix gate check scenario detection