Wonder Guard + FS/DD fix
Merge pull request #997 from Fuzzysqurl/dd2

Wonder Guard + FS/DD fix