Isuue #450 fix

Fix bugs with repeators.