Nasty infinite loop fix