Fix for VMware support