Make this code more robust by not thinking we are making progress