dmitris add the eight iteration patch from bug2474