More insurance against the multi-siren bug.