Fix for generics