Corrected embarrassing incorrect subclassing.