diff --git a/moor_generator/CHANGELOG.md b/moor_generator/CHANGELOG.md
index 78ac339c..97e63add 100644
--- a/moor_generator/CHANGELOG.md
+++ b/moor_generator/CHANGELOG.md
@@ -1,6 +1,9 @@
-## 1.6.0+1
+## 1.6.0+2
 - Generate code to expand array variables
 
+_The +1 release has no changes to 1.6.0, there were issues while uploading to pub. +2
+tightens the analyzer dependency to avoid compilation errors_
+
 ## 1.5.0
 - Parse custom queries and write generated mapping code.
 - Refactorings and minor improvements in the generator
diff --git a/moor_generator/lib/src/parser/table_parser.dart b/moor_generator/lib/src/parser/table_parser.dart
index 678b191f..34aaf361 100644
--- a/moor_generator/lib/src/parser/table_parser.dart
+++ b/moor_generator/lib/src/parser/table_parser.dart
@@ -87,10 +87,7 @@ class TableParser extends ParserBase {
     final parsedPrimaryKey = <SpecifiedColumn>{};
 
     if (expression is SetOrMapLiteral) {
-      // todo replace with just "elements" when dropping support for analyzer
-      // 0.35.0
-      // ignore: deprecated_member_use
-      for (var entry in expression.elements2) {
+      for (var entry in expression.elements) {
         if (entry is Identifier) {
           final column = columns
               .singleWhere((column) => column.dartGetterName == entry.name);
@@ -98,7 +95,7 @@ class TableParser extends ParserBase {
         } else {
           // Don't add an error, these features aren't on a stable dart release
           // yet.
-          print('Unexpected entry in expression.elements2: $entry');
+          print('Unexpected entry in expression.elements: $entry');
         }
       }
     } else {
diff --git a/moor_generator/pubspec.yaml b/moor_generator/pubspec.yaml
index 8f992d7c..ff2799d9 100644
--- a/moor_generator/pubspec.yaml
+++ b/moor_generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: moor_generator
 description: Dev-dependency to generate table and dataclasses together with the moor package.
-version: 1.6.0+1
+version: 1.6.0+2
 repository: https://github.com/simolus3/moor
 homepage: https://moor.simonbinder.eu/
 issue_tracker: https://github.com/simolus3/moor/issues
@@ -12,7 +12,7 @@ environment:
   sdk: '>=2.2.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=0.35.2 <0.38.0'
+  analyzer: '>=0.36.0 <0.38.0'
   recase: ^2.0.1
   built_value: '>=6.3.0 <7.0.0'
   source_gen: ^0.9.4