applied vnet patch from Daniel Hokka Zakrisson