Fixed infinite loop on family attribute iterator
Fixed CS