Correctly unrolled some cycles