Remove the infinite loop