Fix https://github.com/tis-innovation-park/tm-vmm/issues/26