Fix for Dufner's WD