still working on VM fix