Finally upgrading to WDS 4.0.