Removed infinite do loop