diff --git a/SConstruct b/SConstruct
index 278f8954..2aa361bb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -586,6 +586,7 @@ plugins += env.SharedLibrary('plugins/constant', ['src/luminaires/constant.cpp']
 plugins += env.SharedLibrary('plugins/envmap', ['src/luminaires/envmap.cpp'])
 plugins += env.SharedLibrary('plugins/spot', ['src/luminaires/spot.cpp'])
 plugins += env.SharedLibrary('plugins/point', ['src/luminaires/point.cpp'])
+plugins += env.SharedLibrary('plugins/sinusoidal', ['src/luminaires/sinusoidal.cpp'])
 plugins += env.SharedLibrary('plugins/collimated', ['src/luminaires/collimated.cpp'])
 plugins += env.SharedLibrary('plugins/directional', ['src/luminaires/directional.cpp'])
 
diff --git a/src/librender/scene.cpp b/src/librender/scene.cpp
index 753705b4..dad53b5c 100644
--- a/src/librender/scene.cpp
+++ b/src/librender/scene.cpp
@@ -275,11 +275,11 @@ void Scene::initialize() {
 
 		m_aabb = m_kdtree->getAABB();
 		m_bsphere = m_kdtree->getBSphere();
-		for (unsigned int i=0; i<m_media.size(); i++) {
-			const AABB &aabb = m_media[i]->getAABB();
-			m_aabb.expandBy(aabb);
-			for (int j=0; j<8; ++j)
-				m_bsphere.expandBy(aabb.getCorner(j));
+
+		if (m_media.size() > 0) {
+			for (size_t i=0; i<m_media.size(); i++) 
+				m_aabb.expandBy(m_media[i]->getAABB());
+			m_bsphere = m_aabb.getBSphere();
 		}
 	}