Bugfix in class definition. Haven't actually tried running this yet. :-)