Fixed issues with Repeat