diff --git a/Release/scetool.exe b/Release/scetool.exe
index d6c340e..2f024a5 100644
Binary files a/Release/scetool.exe and b/Release/scetool.exe differ
diff --git a/src/keys.cpp b/src/keys.cpp
index e8e98a4..a40b18b 100644
--- a/src/keys.cpp
+++ b/src/keys.cpp
@@ -739,13 +739,13 @@ curve_t *vsh_curve_find(u8 ctype)
 	if(ctype > VSH_CTYPE_MAX)
 		return NULL;
 
-	_memcpy_inv(_tmp_curve.p, _vsh_curves[ctype].p, 20);
-	_memcpy_inv(_tmp_curve.a, _vsh_curves[ctype].a, 20);
-	_memcpy_inv(_tmp_curve.b, _vsh_curves[ctype].b, 20);
+	memcpy(_tmp_curve.p, _vsh_curves[ctype].p, 20);
+	memcpy(_tmp_curve.a, _vsh_curves[ctype].a, 20);
+	memcpy(_tmp_curve.b, _vsh_curves[ctype].b, 20);
 	_tmp_curve.N[0] = ~0x00;
-	_memcpy_inv(_tmp_curve.N+1, _vsh_curves[ctype].N, 20);
-	_memcpy_inv(_tmp_curve.Gx, _vsh_curves[ctype].Gx, 20);
-	_memcpy_inv(_tmp_curve.Gy, _vsh_curves[ctype].Gx, 20);
+	memcpy(_tmp_curve.N+1, _vsh_curves[ctype].N, 20);
+	memcpy(_tmp_curve.Gx, _vsh_curves[ctype].Gx, 20);
+	memcpy(_tmp_curve.Gy, _vsh_curves[ctype].Gy, 20);
 
 	return &_tmp_curve;
 }
@@ -944,10 +944,8 @@ static bool rap_to_klicensee(const s8 *content_id, u8 *klicensee)
 				o = kc < ec2 ? 1 : 0;
 				rap[p] = kc - ec2;
 			}
-			else if (kc == 0xFF)
-				rap[p] = kc - ec2;
 			else
-				rap[p] = kc;
+				rap[p] = kc - ec2;
 		}
 	}
 
diff --git a/src/keys.h b/src/keys.h
index dbc6bc9..a984e47 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -86,10 +86,10 @@ typedef struct _curve
 /*! VSH Curve entry. */
 typedef struct _vsh_curve
 {
+	u8 p[20];
 	u8 a[20];
 	u8 b[20];
 	u8 N[20];
-	u8 p[20];
 	u8 Gx[20];
 	u8 Gy[20];
 } vsh_curve_t;