Fix bug on re-use items in list