Fixing generic discovery