committed bugfix for redundant subclasses