Fix wrong list management