Fix instance to class variable