GrahamA: try to apply the yd plugin earlier.