Work around Generics compiler issues
wip
wip