Fix "repeat" handling - take 2