diff --git a/core/src/main/java/org/openstack4j/openstack/compute/domain/NovaQuotaSet.java b/core/src/main/java/org/openstack4j/openstack/compute/domain/NovaQuotaSet.java
index d97b3e861..7061d8356 100644
--- a/core/src/main/java/org/openstack4j/openstack/compute/domain/NovaQuotaSet.java
+++ b/core/src/main/java/org/openstack4j/openstack/compute/domain/NovaQuotaSet.java
@@ -173,4 +173,9 @@ public String toString() {
 				     .add("injectedFilePathBytes", injectedFilePathBytes).add("keyPairs", keyPairs)
 				     .toString();
 	}
+
+	@JsonRootName("quota_class_set")
+	public static class NovaQuotaSetClass extends NovaQuotaSet {
+        private static final long serialVersionUID = 1L;
+	}
 }
diff --git a/core/src/main/java/org/openstack4j/openstack/compute/internal/QuotaSetServiceImpl.java b/core/src/main/java/org/openstack4j/openstack/compute/internal/QuotaSetServiceImpl.java
index c17ed35b4..fb26b7e45 100644
--- a/core/src/main/java/org/openstack4j/openstack/compute/internal/QuotaSetServiceImpl.java
+++ b/core/src/main/java/org/openstack4j/openstack/compute/internal/QuotaSetServiceImpl.java
@@ -11,6 +11,7 @@
 import org.openstack4j.model.compute.SimpleTenantUsage;
 import org.openstack4j.openstack.compute.domain.NovaLimits;
 import org.openstack4j.openstack.compute.domain.NovaQuotaSet;
+import org.openstack4j.openstack.compute.domain.NovaQuotaSet.NovaQuotaSetClass;
 import org.openstack4j.openstack.compute.domain.NovaQuotaSetUpdate.NovaQuotaSetUpdateClass;
 import org.openstack4j.openstack.compute.domain.NovaQuotaSetUpdate.NovaQuotaSetUpdateTenant;
 import org.openstack4j.openstack.compute.domain.NovaSimpleTenantUsage;
@@ -49,7 +50,7 @@ public QuotaSet updateForClass(String classId, QuotaSetUpdate qs) {
         checkNotNull(classId);
         checkNotNull(qs);
 
-        return put(NovaQuotaSet.class, uri("/os-quota-class-sets/%s", classId)).entity(NovaQuotaSetUpdateClass.from(qs)).execute();
+        return put(NovaQuotaSetClass.class, uri("/os-quota-class-sets/%s", classId)).entity(NovaQuotaSetUpdateClass.from(qs)).execute();
     }
 
     /**