diff --git a/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java b/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java
index 40e7fd5..340ad1b 100644
--- a/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java
+++ b/org.eclipse.modisco.java.generation/src/org/eclipse/modisco/java/generation/utils/JavaUtils.java
@@ -100,7 +100,8 @@
 	private static org.eclipse.jdt.core.formatter.CodeFormatter getDefaultFormatter() {
 		if (JavaUtils.sourceFormatter == null) {
 			// Take default Eclipse formatting options
-			Map<Object, Object> options = org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants
+			// (getEclipseDefaultSettings returned Map up until 4.31)
+			Map<String, String> options = (Map<String, String>) org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants
 					.getEclipseDefaultSettings();
 
 			// Initialize the compiler settings