Fix #6922 - replace builder to with @parent builder