Remove infinite loop