Fixed long list parsing issue