Fixed ClassState