Fixes group selection