Minor fix on image list management