diff --git a/library/src/main/java/com/jaychang/srv/SimpleAdapter.java b/library/src/main/java/com/jaychang/srv/SimpleAdapter.java
index e018983..5ba42f6 100644
--- a/library/src/main/java/com/jaychang/srv/SimpleAdapter.java
+++ b/library/src/main/java/com/jaychang/srv/SimpleAdapter.java
@@ -115,7 +115,7 @@ public int getItemViewType(int position) {
   }
 
   private int getItemViewType(SimpleCell cell) {
-    return cell.getClass().getName().hashCode();
+    return cell.getItem().getClass().getName().hashCode();
   }
 
   @Override
diff --git a/library/src/main/java/com/jaychang/srv/decoration/SectionHeaderItemDecoration.java b/library/src/main/java/com/jaychang/srv/decoration/SectionHeaderItemDecoration.java
index 895e85f..f983766 100644
--- a/library/src/main/java/com/jaychang/srv/decoration/SectionHeaderItemDecoration.java
+++ b/library/src/main/java/com/jaychang/srv/decoration/SectionHeaderItemDecoration.java
@@ -186,7 +186,7 @@ private boolean isSectionType(int position) {
       aClass = aClass.getSuperclass();
     }
 
-    return clazz.getCanonicalName().equals(aClass.getCanonicalName());
+    return clazz.getCanonicalName().equals(aClass.getCanonicalName()) || clazz.getCanonicalName().equals(aClass.getSuperclass().getCanonicalName());
   }
 
   private Object getItem(int position) {