fix builder generic type