fix to last commit + phantom VM fix