Smart group fix