diff --git a/src/main/java/org/dasein/cloud/openstack/nova/os/compute/NovaImage.java b/src/main/java/org/dasein/cloud/openstack/nova/os/compute/NovaImage.java
index 1d7d379..cb1f448 100644
--- a/src/main/java/org/dasein/cloud/openstack/nova/os/compute/NovaImage.java
+++ b/src/main/java/org/dasein/cloud/openstack/nova/os/compute/NovaImage.java
@@ -539,7 +539,7 @@ else if( md.has("image_type") && !md.isNull("image_type") && md.getString("image
                     if( s.equals("saving") ) {
                         currentState = MachineImageState.PENDING;
                     }
-                    else if( s.equals("active") || s.equals("queued") || s.equals("preparing") ) {
+                    else if( s.equals("active")  ) {
                         currentState = MachineImageState.ACTIVE;
                     }
                     else if( s.equals("deleting") ) {
@@ -549,6 +549,7 @@ else if( s.equals("killed") || s.equals("deleted") ) {
                         currentState = MachineImageState.DELETED;
                     }
                     else {
+                        // everything else including 'queued' and 'preparing'
                         logger.warn("toImage(): Unknown image status: " + s);
                         currentState = MachineImageState.PENDING;
                     }
@@ -638,10 +639,10 @@ else if( md != null && md.has("image_type") && !md.isNull("image_type") && md.ge
             if( json.has("status") ) {
                 String s = json.getString("status").toLowerCase();
 
-                if( s.equals("saving") ) {
+                if( s.equals("saving") || s.equals("queued") || s.equals("preparing") ) {
                     state = MachineImageState.PENDING;
                 }
-                else if( s.equals("active") || s.equals("queued") || s.equals("preparing") ) {
+                else if( s.equals("active")  ) {
                     state = MachineImageState.ACTIVE;
                 }
                 else if( s.equals("deleting") ) {