Fixed stream parsing to not duplicate fields

Fixed improper field parsing