diff --git a/EU07.bpr b/EU07.bpr
index 8c547f2a..4d6169e2 100644
--- a/EU07.bpr
+++ b/EU07.bpr
@@ -60,7 +60,7 @@ AutoIncBuild=0
 MajorVer=16
 MinorVer=0
 Release=1173
-Build=477
+Build=478
 Debug=1
 PreRelease=0
 Special=0
@@ -72,7 +72,7 @@ CodePage=1250
 [Version Info Keys]
 CompanyName=EU07 Team
 FileDescription=MaSzyna EU07-424
-FileVersion=16.0.1173.477
+FileVersion=16.0.1173.478
 InternalName=DP+SPKS+asynch+python
 LegalCopyright=
 LegalTrademarks=
diff --git a/EU07.res b/EU07.res
index 4c2d29ab..b826ec23 100644
Binary files a/EU07.res and b/EU07.res differ
diff --git a/Globals.cpp b/Globals.cpp
index 0479b6b1..175bfb07 100644
--- a/Globals.cpp
+++ b/Globals.cpp
@@ -49,9 +49,9 @@ double Global::fLuminance = 1.0; // jasno
 int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki
 HWND Global::hWnd = NULL; // uchwyt okna
 int Global::iCameraLast = -1;
-AnsiString Global::asRelease = "16.0.1172.477";
+AnsiString Global::asRelease = "16.0.1172.478";
 AnsiString Global::asVersion =
-    "Compilation 2016-06-10, release " + Global::asRelease + "."; // tutaj, bo wysyłany
+    "Compilation 2016-06-23, release " + Global::asRelease + "."; // tutaj, bo wysyłany
 int Global::iViewMode = 0; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty
 int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego
 int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0,
diff --git a/Train.cpp b/Train.cpp
index 1e969b67..d4452626 100644
--- a/Train.cpp
+++ b/Train.cpp
@@ -459,7 +459,10 @@ void TTrain::OnKeyDown(int cKey)
 				if (mvOccupied->BatterySwitch(true)) // bateria potrzebna np. do zapalenia świateł
 				{
 					dsbSwitch->Play(0, 0, 0);
-					SetLights();
+					if (mvOccupied->LightsPosNo > 0)
+					{
+						SetLights();
+					}
 					if (TestFlag(mvOccupied->SecuritySystem.SystemType,
 						2)) // Ra: znowu w kabinie jest coś, co być nie powinno!
 					{
diff --git a/World.cpp b/World.cpp
index 441bcd4a..8582f2a1 100644
--- a/World.cpp
+++ b/World.cpp
@@ -1552,7 +1552,7 @@ bool TWorld::Update()
 						glDisable(GL_FOG);
 						//glColor4f(0.15f, 0.15f, 0.15f, 0.25f);
 						glBindTexture(GL_TEXTURE_2D, light); // Select our texture
-						float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0
+						//float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0
 						glBegin(GL_QUADS);
 						float fSmudge = Train->Dynamic()->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę
 						if (Train->Controlled()->iLights[0] & 21)
@@ -1561,7 +1561,7 @@ bool TWorld::Update()
 							{
 								float z = i * i * i * 0.01f;//25/4;
 								//float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl));
-								float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(ddl+0.015))-1);
+								float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(Global::fLuminance+0.015))-1);
 								glColor4f(C, C, C, 0.25f);
 								glTexCoord2f(0, 0);  glVertex3f(-10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3);
 								glTexCoord2f(1, 0);  glVertex3f(10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3);
@@ -1574,7 +1574,7 @@ bool TWorld::Update()
 							for (int i = 15; i <= 35; i++)
 							{
 								float z = i * i * i * 0.01f;//25/4;
-								float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(ddl+0.015))-1);
+								float C = (36 - i*0.5)*0.005*sqrt((1/sqrt(Global::fLuminance+0.015))-1);
 								glColor4f(C, C, C, 0.25f);
 								glTexCoord2f(0, 0);  glVertex3f(10 / 2 + 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3);
 								glTexCoord2f(1, 0);  glVertex3f(-10 / 2 - 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3);