Fixing to allow running on VM