Still chasing those infinite loops