Fixed not having $builder set