Fixed a problem where the list would grow forever