Fixed subclassing issue.