Fixed subclassing