Fixed never ending list issue