Updated to latest fixed base class.