Since this appears to be necessary for all derivatives anyway, we'll add this directly to the base class.