windows fix #1
windows fix #2