Fix the forever loop