Fixed major bug in raw-byte parsing