Fixing generic <>