If this caused an infinite loop before, shouldn't this have a timeout? Not sure...