Fix lurking bug with SoS races without custom IDs