The previous mingw32 fix unfortunately broke mingw-w64, so that is now fixed too.