Straightening out the ship on a windy day