WD improvements
Small fix