fix reference to class vars