Better multi-byte handling