Fix heritage issue with multiple children