Fix for an issue where the incorrect GCM combo list was being populated per scenario