Bug fix for windows #51