Working on the windows fix