update list & fix issue