Better fix that removes empty lists