Improved patch for !_WIN32