Added empty $class variable (again)