Fix recursive listing