Partial fix for Cygwin bug