diff --git a/src/core/CameraImpl.cpp b/src/core/CameraImpl.cpp
index b82d786..73076c0 100644
--- a/src/core/CameraImpl.cpp
+++ b/src/core/CameraImpl.cpp
@@ -30,6 +30,7 @@ CameraImpl::CameraImpl() :
 
 CameraImpl::~CameraImpl()
 {
+  _camera->stop();
   delete _camera;
   delete _cameraSurface;
 }
diff --git a/src/core/MappingManager.cpp b/src/core/MappingManager.cpp
index f99c9cc..539f490 100644
--- a/src/core/MappingManager.cpp
+++ b/src/core/MappingManager.cpp
@@ -105,6 +105,7 @@ bool MappingManager::removePaint(uid paintId)
     Q_ASSERT(idx != -1);
     paintVector.remove(idx);
     paintMap.remove(paintId);
+    paint->~Paint(); // FIX ME: Explicit call of paint destructor in order add Camera more than once
     return true;
   }
   else