Merge pull request #2919 from rubenk/virt-fix-segfault