Updated Dependencies & Removed Possible Infinite Loop