diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java
index 379587a652..7274d0a142 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/BlockDeviceMapping.java
@@ -1,3 +1,21 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
 package org.jclouds.aws.ec2.domain;
 
 import com.google.common.collect.ImmutableList;
diff --git a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java
index a2f557984b..15cbe8d2e2 100644
--- a/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java
+++ b/aws/core/src/main/java/org/jclouds/aws/ec2/domain/RunningInstance.java
@@ -92,6 +92,11 @@ public class RunningInstance implements Comparable<RunningInstance> {
                return false;
          } else if (!attachTime.equals(other.attachTime))
             return false;
+         if (deviceName == null) {
+            if (other.deviceName != null)
+               return false;
+         } else if (!deviceName.equals(other.deviceName))
+            return false;
          if (attachmentStatus == null) {
             if (other.attachmentStatus != null)
                return false;