Fix map for empty lists