mod to comply with changed base class