diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java
index d80d098ea3..61dc27b291 100644
--- a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java
+++ b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/processor/handler/singular/SingularMapHandler.java
@@ -60,7 +60,7 @@ public void addBuilderField(@NotNull List<PsiField> fields, @NotNull PsiVariable
 
   @NotNull
   protected PsiType getBuilderFieldType(@NotNull PsiType psiType, @NotNull Project project) {
-    return PsiTypeUtil.getGenericCollectionClassType((PsiClassType) psiType, project, CommonClassNames.JAVA_UTIL_ARRAY_LIST);
+    return PsiTypeUtil.getGenericCollectionClassType(psiType, project, CommonClassNames.JAVA_UTIL_ARRAY_LIST);
   }
 
   protected void addOneMethodParameter(@NotNull String singularName, @NotNull PsiType[] psiParameterTypes, @NotNull LombokLightMethodBuilder methodBuilder) {
diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/util/PsiTypeUtil.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/util/PsiTypeUtil.java
index e25c8f65ea..ff799c1c5b 100644
--- a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/util/PsiTypeUtil.java
+++ b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/util/PsiTypeUtil.java
@@ -49,7 +49,7 @@ public static PsiType[] extractTypeParameters(@NotNull PsiType psiType, @NotNull
   }
 
   @NotNull
-  public static PsiClassType getGenericCollectionClassType(@NotNull PsiClassType psiType, @NotNull Project project, @NotNull String qualifiedName) {
+  public static PsiClassType getGenericCollectionClassType(@NotNull PsiType psiType, @NotNull Project project, @NotNull String qualifiedName) {
     final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
     final JavaPsiFacade facade = JavaPsiFacade.getInstance(project);
     final GlobalSearchScope globalsearchscope = GlobalSearchScope.allScope(project);
diff --git a/lombok-plugin/src/main/resources/META-INF/plugin.xml b/lombok-plugin/src/main/resources/META-INF/plugin.xml
index b31c9bc4eb..be001800b7 100644
--- a/lombok-plugin/src/main/resources/META-INF/plugin.xml
+++ b/lombok-plugin/src/main/resources/META-INF/plugin.xml
@@ -202,6 +202,7 @@
 		<ul>
 		<li>0.9.8
 				<ol>
+				     <li>Fixed #156: Exception in @Singular handling</li>
 				     <li>Fixed #165: Can't correctly resolve multiple @Builder methods in same class having partial implementations</li>
 				     <li>Fixed #172: "Lombok needs a default constructor in the base class" error in enum</li>
 				</ol>
diff --git a/lombok-plugin/src/main/resources/messages/lombokBundle.properties b/lombok-plugin/src/main/resources/messages/lombokBundle.properties
index 92faf586a5..ec6acb590a 100644
--- a/lombok-plugin/src/main/resources/messages/lombokBundle.properties
+++ b/lombok-plugin/src/main/resources/messages/lombokBundle.properties
@@ -1,5 +1,6 @@
 daemon.donate.title=Lombok support plugin updated to v{0}
 daemon.donate.content=\
+- Fixed (<a href="/mplushnikov/lombok-intellij-plugin/issues/156">#156</a>): Exception in @Singular handling<br/>\
 - Fixed (<a href="/mplushnikov/lombok-intellij-plugin/issues/165">#165</a>): Can't correctly resolve multiple @Builder methods in same class having partial implementations<br/>\
 - Fixed (<a href="/mplushnikov/lombok-intellij-plugin/issues/172">#172</a>): "Lombok needs a default constructor in the base class" error in enum<br/>\
   <br/>\
diff --git a/test-manual/lombok/src/main/java/de/plushnikov/builder/issue156/StringMapBuilder.java b/test-manual/lombok/src/main/java/de/plushnikov/builder/issue156/StringMapBuilder.java
new file mode 100644
index 0000000000..aab46a7ee2
--- /dev/null
+++ b/test-manual/lombok/src/main/java/de/plushnikov/builder/issue156/StringMapBuilder.java
@@ -0,0 +1,19 @@
+package de.plushnikov.builder.issue156;
+
+import lombok.Builder;
+import lombok.Singular;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class StringMapBuilder<R> extends HashMap<String, R>{
+
+    @Builder
+    StringMapBuilder(@Singular Map<String, ? extends R> entries) {
+        super(entries);
+    }
+
+    public static void main(String[] args) {
+
+    }
+}