fixed infinite loop finally/probably