subclassing fixes.