Bug fix possibly for windows.