diff --git a/lib/main.dart b/lib/main.dart
index c00ccef..fe3982c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -31,7 +31,7 @@ part 'card_class.dart';
 
 EventBus eventBus = new EventBus();
 const String appName = "HA Client";
-const appVersion = "0.3.1";
+const appVersion = "0.3.2";
 
 String homeAssistantWebHost;
 
diff --git a/lib/view_builder.class.dart b/lib/view_builder.class.dart
index e88c082..c84ea03 100644
--- a/lib/view_builder.class.dart
+++ b/lib/view_builder.class.dart
@@ -31,7 +31,12 @@ class ViewBuilder{
     Map<String, List<String>> userGroupsList = entityCollection.getDefaultViewTopLevelEntities();
     List<Entity> entitiesForView = [];
     userGroupsList["userGroups"].forEach((groupId){
-      entitiesForView.add(entityCollection.get(groupId));
+      TheLogger.log("Debug","----User defined group: $groupId");
+      Entity en = entityCollection.get(groupId);
+      if (en.isGroup) {
+        en.childEntities = entityCollection.getAll(en.childEntityIds);
+      }
+      entitiesForView.add(en);
     });
     userGroupsList["notGroupedEntities"].forEach((entityId){
       entitiesForView.add(entityCollection.get(entityId));
diff --git a/pubspec.yaml b/pubspec.yaml
index d5ae032..adc4a26 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.3.1+41
+version: 0.3.2+42
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"