Fixed instance/class variable bug!