[#902] Fixed bugs in enumerator streaming