Respect results of WOA.
Merge pull request #3617 from t-nelson/respect_woa

Respect results of WOA.