Corrected group disambiguation behaviour.