Made windows version work with 24.4