Improve repeatOne functionality