diff --git a/src/zr/volfeatures/volclassedit.inc b/src/zr/volfeatures/volclassedit.inc
index 79cf1a0..529f680 100644
--- a/src/zr/volfeatures/volclassedit.inc
+++ b/src/zr/volfeatures/volclassedit.inc
@@ -458,7 +458,7 @@ VolClassEditDumpData(dataIndex, String:buffer[], maxlen)
  */
 VolClassEditApply(client, dataIndex)
 {
-    switch (VolClassEditData[client][VolClassEdit_Mode])
+    switch (VolClassEditData[dataIndex][VolClassEdit_Mode])
     {
         case ClassEditMode_Name:
         {
@@ -494,7 +494,7 @@ VolClassEditRestore(client, dataIndex)
 {
     new classindex = ClassGetActiveIndex(client);
     
-    switch (VolClassEditData[client][VolClassEdit_Mode])
+    switch (VolClassEditData[dataIndex][VolClassEdit_Mode])
     {
         case ClassEditMode_Name:
         {