Best Builder chaining fix I can think about atm.