RepeatBlock issues fixed