Fixed windows crash for real now.