=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-03-08 05:30:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-03-08 06:33:11 +0000
@@ -255,8 +255,8 @@
 
     public static boolean isDefaultClass( Class<?> klass )
     {
-        return (DataElementCategory.class.isAssignableFrom( klass ) || DataElementCategoryOption.class.isInstance( klass )
-            || DataElementCategoryCombo.class.isInstance( klass ));
+        return DataElementCategory.class.isAssignableFrom( klass ) || DataElementCategoryOption.class.isAssignableFrom( klass )
+            || DataElementCategoryCombo.class.isAssignableFrom( klass );
     }
 
     public static boolean isDefault( IdentifiableObject object )