Fix for repeating groups defect