diff --git a/source/common b/source/common
index a887a31b4b9541a0997e9fa8ac34ad62977813fc..84f4b39f550925479257f3032002e9aab2a5999e 160000
--- a/source/common
+++ b/source/common
@@ -1 +1 @@
-Subproject commit a887a31b4b9541a0997e9fa8ac34ad62977813fc
+Subproject commit 84f4b39f550925479257f3032002e9aab2a5999e
diff --git a/source/light/ShadowCache.h b/source/light/ShadowCache.h
index 3efd3f56e58e5ef852d0baf8957cc0d819dff76d..757b73c4e9fea9dd42e6e2ab941e3125f67f3b0b 100644
--- a/source/light/ShadowCache.h
+++ b/source/light/ShadowCache.h
@@ -121,7 +121,6 @@ protected:
 	{
 	private:
 		IXRenderPipeline *m_pRenderPipeline;
-		//! @fixme this should be properly aligned!
 		Array<T> m_aMaps;
 		Array<T*> m_aMapsQueue;
 		LIGHT_RENDER_TYPE m_renderType;
diff --git a/source/light/light.h b/source/light/light.h
index b67b0c18b011b1268bfc6f4f9df94425e67e64dd..0beee874288b85a888503377c7660dae2849b592 100644
--- a/source/light/light.h
+++ b/source/light/light.h
@@ -30,6 +30,8 @@ public:
 	CXLight(CLightSystem *pLightSystem);
 	~CXLight();
 
+	SX_ALIGNED_OP_MEM2();
+
 	LIGHT_TYPE getType();
 
 	float3 getColor();
@@ -141,8 +143,6 @@ protected:
 class CXLightSun: public CXLight, public virtual IXLightSun
 {
 public:
-	SX_ALIGNED_OP_MEM2();
-
 	CXLightSun(CLightSystem *pLightSystem);
 	~CXLightSun();