Fix duplicate types