Fix for group selector