small bugfix: static to class vars