Fixed 2 byte parsing issue