diff --git a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToHardware.java b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToHardware.java
index 09b71eee4e..f5417c3a0d 100644
--- a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToHardware.java
+++ b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToHardware.java
@@ -51,6 +51,7 @@ public class IMachineToHardware implements Function<IMachine, Hardware> {
       Boolean is64Bit = guestOSType.getIs64Bit();
       HardwareBuilder hardwareBuilder = new HardwareBuilder();
       hardwareBuilder.ids(vm.getId());
+      hardwareBuilder.supportsImage(ImagePredicates.idEquals(vm.getId()));
       hardwareBuilder.is64Bit(is64Bit);
       hardwareBuilder.supportsImage(ImagePredicates.idEquals(vm.getId()));
       return hardwareBuilder.build();
diff --git a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToImage.java b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToImage.java
index b0d4d3f5f4..8b4f9a3312 100644
--- a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToImage.java
+++ b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToImage.java
@@ -50,7 +50,6 @@ public class IMachineToImage implements Function<IMachine, Image> {
 
       IGuestOSType guestOSType = virtualboxManager.getVBox().getGuestOSType(from.getOSTypeId());
 
-      //Somehow this method gets called with the correct product item.
       OsFamily family = osFamily().apply(guestOSType.getDescription());
       OperatingSystem os = OperatingSystem.builder()
               .description(guestOSType.getDescription())
diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IMachineToHardwareTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IMachineToHardwareTest.java
index 70e4c2e053..ab89668ecd 100644
--- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IMachineToHardwareTest.java
+++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IMachineToHardwareTest.java
@@ -49,12 +49,13 @@ public class IMachineToHardwareTest {
       String machineId = "hw-machineId";
 
       expect(vm.getOSTypeId()).andReturn("os-type").anyTimes();
+      expect(vm.getId()).andReturn(machineId).anyTimes();
+
       expect(vm.getDescription()).andReturn(linuxDescription).anyTimes();
 
       expect(vBox.getGuestOSType(eq("os-type"))).andReturn(guestOsType);
       expect(vbm.getVBox()).andReturn(vBox);
       expect(guestOsType.getIs64Bit()).andReturn(true);
-      expect(vm.getId()).andReturn(machineId).atLeastOnce();
 
       replay(vbm, vBox, vm, guestOsType);