Making automated groups work again