One more generics fix