Fixed windows (hopefully for real)