Fix the stream vs list evaluation