Bug fix to support Windows