diff --git a/sparc/aes.asm b/sparc/aes.asm
index 43c8a2c60eb23f55599bc5c3823853330bc49ec7..6ebecdd7f13ed3961c2aebb226066fe8969d0feb 100644
--- a/sparc/aes.asm
+++ b/sparc/aes.asm
@@ -181,16 +181,17 @@ _aes_crypt:
 	add	i, 4, i
 
 	C i = 1
-	ld	[IDX1+i], t1		! 1
+	ld	[IDX1+4], t1		! 1
 	
 	! IDX2(j) = j XOR 2
-	xor	i, 8, t2
+	C xor	i, 8, t2		! 2
+	mov	12, t2			! 2
 	add	wtxt, t1, t1		! 1
 	ldub	[t1+2], t1		! 1
-	ld	[IDX3+i], t3		! 3
+	ld	[IDX3+4], t3		! 3
 	
 	sll	t1, 2, t1		! 1
-	ld	[wtxt+i], t0		! 0
+	ld	[wtxt+4], t0		! 0
 	lduh	[wtxt+t2], t2		! 2
 	and	t0, 255, t0		! 0
 	
@@ -208,11 +209,11 @@ _aes_crypt:
 	xor	t0, t1, t0		! 0, 1
 	xor	t0, t2, t0		! 0, 1, 2
 	! Fetch roundkey
-	ld	[key+i], t1
+	ld	[key+4], t1
 	
 	xor	t0, t3, t0		! 0, 1, 2, 3
 	xor	t0, t1, t0
-	st	t0, [tmp+i]
+	st	t0, [tmp+4]
 	add	i, 4, i
 
 	C = 2