diff --git a/pyicon/pyicon_plotting.py b/pyicon/pyicon_plotting.py
index 4169ef2064c3604f5a8a26274e29db6ba453839c..531b30e7983dd51408fcd88ea7f8f7cd575923ed 100644
--- a/pyicon/pyicon_plotting.py
+++ b/pyicon/pyicon_plotting.py
@@ -492,6 +492,11 @@ def shade(
       norm = matplotlib.colors.BoundaryNorm(boundaries=clevs, ncolors=cmap.N)
       cmap.set_under(cmap_e(norm_e(0)))
       cmap.set_over(cmap_e(norm_e(nlev)))
+      vmin = None
+      vmax = None
+    else:
+      vmin = clim[0]
+      vmax = clim[1]
   
     # --- decide whether to use extra contour lines
     if conts is None:
@@ -553,7 +558,7 @@ def shade(
                            norm=norm,
                            rasterized=rasterized,
                            edgecolor=edgecolor,
-                           shading='nearest',
+                           shading='auto',
                            **ccrsdict
                           )
       else:
@@ -635,7 +640,7 @@ def shade(
         else:
           cborientation = 'horizontal'
       # ------ make actual colorbar
-      cb = plt.colorbar(mappable=hm, cax=cax, extend=extend, orientation=cborientation)
+      cb = plt.colorbar(mappable=hm, cax=cax, orientation=cborientation)
       # ------ prevent white lines if fig is saved as pdf
       cb.solids.set_edgecolor("face")
       # ------ use exponential notation for large colorbar ticks