fixed the list changing issue