#254 Modify Generic Type