diff --git a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
index c623e480350491c418988d3f1322d14a5644bf3a..0856bb7006d4bdb8392bea39dd17d851a26f2f5c 100644
--- a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
+++ b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
@@ -138,9 +138,9 @@ public class StyleManager {
   private Color errorBarsColor;
 
   // Formatting ////////////////////////////////
-  private String datePattern;
   private Locale locale;
   private TimeZone timezone;
+  private String datePattern;
   private String decimalPattern;
 
   /**
@@ -223,9 +223,9 @@ public class StyleManager {
     errorBarsColor = theme.getErrorBarsColor();
 
     // Formatting ////////////////////////////////
-    datePattern = null; // if not null, this override pattern will be used
     locale = Locale.getDefault();
     timezone = TimeZone.getDefault();
+    datePattern = null; // if not null, this override pattern will be used
     decimalPattern = null;
   }
 
@@ -1047,21 +1047,6 @@ public class StyleManager {
 
   // Formatting ////////////////////////////////
 
-  /**
-   * Set the String formatter for Data x-axis
-   * 
-   * @param pattern - the pattern describing the date and time format
-   */
-  public void setDatePattern(String datePattern) {
-
-    this.datePattern = datePattern;
-  }
-
-  public String getDatePattern() {
-
-    return datePattern;
-  }
-
   /**
    * Set the locale to use for rendering the chart
    * 
@@ -1092,6 +1077,21 @@ public class StyleManager {
     return timezone;
   }
 
+  /**
+   * Set the String formatter for Data x-axis
+   * 
+   * @param pattern - the pattern describing the date and time format
+   */
+  public void setDatePattern(String datePattern) {
+
+    this.datePattern = datePattern;
+  }
+
+  public String getDatePattern() {
+
+    return datePattern;
+  }
+
   /**
    * Set the decimal formatter for all tick labels
    * 
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
index 0f98c812bd67fcba483f2459681971d3b0082623..8d11b790ba7b9be0197770e4bb88e0c0f3857708 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
@@ -114,7 +114,7 @@ public class NumberFormatter {
 
     String decimalPattern;
 
-    if (styleManager.getDatePattern() == null) {
+    if (styleManager.getDecimalPattern() == null) {
 
       decimalPattern = getFormatPattern(value, min, max);
     }
@@ -140,12 +140,12 @@ public class NumberFormatter {
 
     String decimalPattern;
 
-    if (styleManager.getDatePattern() == null) {
+    if (styleManager.getDecimalPattern() == null) {
 
       decimalPattern = "0E0";
     }
     else {
-      decimalPattern = styleManager.getDatePattern();
+      decimalPattern = styleManager.getDecimalPattern();
     }
 
     DecimalFormat normalFormat = (DecimalFormat) numberFormat;