Fix for empty lists