diff --git a/gradle.properties b/gradle.properties
index 343e904..dcc50a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 # Project details
 group=com.readytalk
-version=2.1.2
+version=2.1.3
 
 
 # Optimize the build environment
diff --git a/src/main/java/com/readytalk/swt/text/painter/TextPainter.java b/src/main/java/com/readytalk/swt/text/painter/TextPainter.java
index a3ced95..180690b 100644
--- a/src/main/java/com/readytalk/swt/text/painter/TextPainter.java
+++ b/src/main/java/com/readytalk/swt/text/painter/TextPainter.java
@@ -218,11 +218,11 @@ private TextPainter setFont(final String name, final int height) {
    * @return {@link TextPainter}
    */
   public TextPainter setDefaultFontHeight(final int height) {
-    font = FontFactory.getFont(this.parent.getDisplay(), height, SWT.NORMAL, font.getFontData()[0].name);
-    boldFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.BOLD, boldFont.getFontData()[0].name);
-    italicFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.ITALIC, italicFont.getFontData()[0].name);
-    underlineFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.UNDERLINE_LINK, underlineFont.getFontData()[0].name);
-    boldAndItalicFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.ITALIC|SWT.BOLD, boldAndItalicFont.getFontData()[0].name);
+    font = FontFactory.getFont(this.parent.getDisplay(), height, SWT.NORMAL, font.getFontData()[0].getName());
+    boldFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.BOLD, boldFont.getFontData()[0].getName());
+    italicFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.ITALIC, italicFont.getFontData()[0].getName());
+    underlineFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.UNDERLINE_LINK, underlineFont.getFontData()[0].getName());
+    boldAndItalicFont = FontFactory.getFont(this.parent.getDisplay(), height, SWT.ITALIC|SWT.BOLD, boldAndItalicFont.getFontData()[0].getName());
     return this;
   }