Fixing bug with OCTET_STREAM