diff --git a/encodeuint64.go b/encodeuint64.go
index dae7d96..28ec05a 100644
--- a/encodeuint64.go
+++ b/encodeuint64.go
@@ -1,14 +1,16 @@
 package hexadeca
 
 func EncodeUint64(value uint64, symbolFunc func(byte)rune) (r15 rune, r14 rune, r13 rune, r12 rune, r11 rune, r10 rune, r9 rune, r8 rune, r7 rune, r6 rune, r5 rune, r4 rune, r3 rune, r2 rune, r1 rune, r0 rune) {
-	r15, r14 = EncodeByte(byte((0xff00000000000000 & value) >> (8 * 7)), symbolFunc)
-	r13, r12 = EncodeByte(byte((0x00ff000000000000 & value) >> (8 * 6)), symbolFunc)
-	r11, r10 = EncodeByte(byte((0x0000ff0000000000 & value) >> (8 * 5)), symbolFunc)
-	r9,  r8  = EncodeByte(byte((0x000000ff00000000 & value) >> (8 * 4)), symbolFunc)
-	r7,  r6  = EncodeByte(byte((0x00000000ff000000 & value) >> (8 * 3)), symbolFunc)
-	r5,  r4  = EncodeByte(byte((0x0000000000ff0000 & value) >> (8 * 2)), symbolFunc)
-	r3,  r2  = EncodeByte(byte((0x000000000000ff00 & value) >> (8    )), symbolFunc)
-	r1,  r0  = EncodeByte(byte( 0x00000000000000ff & value            ), symbolFunc)
+	r15, r14 = EncodeByte(byte(0x00000000000000ff & (value >> (8 * 7))), symbolFunc)
+	r13, r12 = EncodeByte(byte(0x00000000000000ff & (value >> (8 * 6))), symbolFunc)
+	r11, r10 = EncodeByte(byte(0x00000000000000ff & (value >> (8 * 5))), symbolFunc)
+	r9,  r8  = EncodeByte(byte(0x00000000000000ff & (value >> (8 * 4))), symbolFunc)
+	r7,  r6  = EncodeByte(byte(0x00000000000000ff & (value >> (8 * 3))), symbolFunc)
+
+	r5,  r4  = EncodeByte(byte(0x00000000000000ff & (value >> (8 * 2))), symbolFunc)
+	r3,  r2  = EncodeByte(byte(0x00000000000000ff & (value >> (8    ))), symbolFunc)
+
+	r1,  r0  = EncodeByte(byte(0x00000000000000ff &  value            ), symbolFunc)
 
 	return
 }