diff --git a/HISTORY b/HISTORY
index c410804..01f8031 100644
--- a/HISTORY
+++ b/HISTORY
@@ -167,4 +167,8 @@ Version 0.1.4
 Version 0.1.5
 
 - removed suppression of first DisplayChannel call after VDR start
+- fixed "flickering" bug with vdr2.1.7
+- fixed bug that osd language was not set correctly which caused one
+  additional skin caching at startup
 
+Version 0.1.6
diff --git a/config.c b/config.c
index d7f68b1..192f1e4 100644
--- a/config.c
+++ b/config.c
@@ -24,7 +24,7 @@ cDesignerConfig::cDesignerConfig() {
     SetSkin();
     SetOSDSize();
     SetOSDFonts();
-    osdLanguage = Setup.OSDLanguage;
+    osdLanguage = "";
 }
 
 cDesignerConfig::~cDesignerConfig() {
diff --git a/config.h b/config.h
index ac155fc..ab53c44 100644
--- a/config.h
+++ b/config.h
@@ -63,6 +63,7 @@ public:
     bool OsdSizeChanged(void);
     void SetOSDFonts(void);
     bool OsdFontsChanged(void);
+    void SetOsdLanguage(void) { osdLanguage = Setup.OSDLanguage; };
     bool OsdLanguageChanged(void);
     cString GetSkinRessourcePath(void);
     void AddPlugin(string name, map < int, string > &menus);
diff --git a/displaychannel.c b/displaychannel.c
index 540a0c4..711f05a 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -22,8 +22,6 @@ cSDDisplayChannel::cSDDisplayChannel(cTemplate *channelTemplate, bool WithInfo)
         doOutput = false;
         return;
     }
-    channelView->DrawBackground();
-    channelView->DrawSignalBackground();
 }
 
 cSDDisplayChannel::~cSDDisplayChannel() {
@@ -165,6 +163,8 @@ void cSDDisplayChannel::Flush(void) {
         return;
 
     if (initial) {
+        channelView->DrawBackground();
+        channelView->DrawSignalBackground();
         channelView->DrawCurrentWeather();
         channelView->DrawCustomTokens();
     }
diff --git a/skindesigner.c b/skindesigner.c
index fa7834e..76a887b 100644
--- a/skindesigner.c
+++ b/skindesigner.c
@@ -104,6 +104,7 @@ bool cPluginSkinDesigner::Start(void) {
         trueColorAvailable = false;
     } else
         dsyslog("skindesigner: TrueColor OSD found");
+    config.SetOsdLanguage();
     config.SetPathes();
     config.ReadSkins();
     config.InitSkinIterator();