Fix support for generic records