Fixed wind from my last commit.
Merge