Respect results of WOA.

For @MartijnKaijser . I did this blind, it compiles at least.  Please test