diff --git a/output/text/hex.c b/output/text/hex.c
index f1529860..c5d12708 100644
--- a/output/text/hex.c
+++ b/output/text/hex.c
@@ -46,7 +46,7 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
 	struct context *ctx;
 	unsigned int outsize, offset, p;
 	int max_linelen;
-	uint64_t sample;
+	const uint8_t *sample;
 	uint8_t *outbuf;
 
 	ctx = o->internal;
@@ -71,10 +71,10 @@ SR_PRIV int data_hex(struct sr_output *o, const uint8_t *data_in,
 	ctx->line_offset = 0;
 	for (offset = 0; offset <= length_in - ctx->unitsize;
 	     offset += ctx->unitsize) {
-		memcpy(&sample, data_in + offset, ctx->unitsize);
+		sample = data_in + offset;
 		for (p = 0; p < ctx->num_enabled_probes; p++) {
 			ctx->linevalues[p] <<= 1;
-			if (sample & ((uint64_t) 1 << p))
+			if (sample[p / 8] & ((uint8_t) 1 << (p % 8)))
 				ctx->linevalues[p] |= 1;
 			sprintf((char *)ctx->linebuf + (p * ctx->linebuf_len) +
 				ctx->line_offset, "%.2x", ctx->linevalues[p]);