Add infinite loop to questions in UC