instance and class variable fix