carry over fix to windows too.