fix builder pattern