Fix Infinity Loop