Attempting to fix crash on windows machines.