Alpha - Attempting fix of windows crash