Added support for zerovm/zrt issue #31