List efficiency fix