--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Wed Feb 14 18:16:03 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Wed Feb 14 18:45:01 2018 +0100
@@ -36,7 +36,7 @@
 import org.dive4elements.artifacts.CallContext;
 
 import org.dive4elements.river.artifacts.D4EArtifact;
-
+import org.dive4elements.river.exports.DiagramAttributes.AxisAttributes;
 import org.dive4elements.river.exports.process.Processor;
 
 import org.dive4elements.river.jfree.RiverAnnotation;
@@ -1270,19 +1270,25 @@
 
     @Override
     protected NumberAxis createYAxis(int index) {
+        
+        final AxisAttributes axisAttributes = diagramAttributes.getAxesAttributes().get(index);
+        
+        boolean logarithmic = (Boolean)axisAttributes.isLog().evaluate((D4EArtifact)getMaster(), context);
+
         NumberAxis axis;
-        boolean logarithmic = (Boolean)diagramAttributes.getAxesAttributes().
-            get(index).isLog().evaluate((D4EArtifact)getMaster(), context);
-
         if (logarithmic) {
             axis = new LogarithmicAxis(getYAxisLabel(index));
         } else {
             axis = super.createYAxis(index);
         }
 
-        if (diagramAttributes.getAxesAttributes().get(index).includeZero()) {
+        if (axisAttributes.includeZero()) {
             axis.setAutoRangeIncludesZero(true);
         }
+        
+        axis.setLowerMargin(axisAttributes.getLowerMargin());
+        axis.setUpperMargin(axisAttributes.getUpperMargin());
+        
         return axis;
     }