Quick and dirty fix for new AbstractBase requirements (for new modules).