Final fix for MinGW