diff --git a/dGame/dBehaviors/SwitchBehavior.cpp b/dGame/dBehaviors/SwitchBehavior.cpp
index c010f31b..089ccbd0 100644
--- a/dGame/dBehaviors/SwitchBehavior.cpp
+++ b/dGame/dBehaviors/SwitchBehavior.cpp
@@ -30,7 +30,7 @@ void SwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 
 	Game::logger->LogDebug("SwitchBehavior", "[%i] State: (%d), imagination: (%i) / (%f)", entity->GetLOT(), state, destroyableComponent->GetImagination(), destroyableComponent->GetMaxImagination());
 
-	if (state || (entity->GetLOT() == 8092 && destroyableComponent->GetImagination() >= m_imagination)) {
+	if (state && destroyableComponent->GetImagination() >= m_imagination) {
 		this->m_actionTrue->Handle(context, bitStream, branch);
 	} else {
 		this->m_actionFalse->Handle(context, bitStream, branch);
diff --git a/dGame/dComponents/RebuildComponent.cpp b/dGame/dComponents/RebuildComponent.cpp
index fcf2738c..7f88a67c 100644
--- a/dGame/dComponents/RebuildComponent.cpp
+++ b/dGame/dComponents/RebuildComponent.cpp
@@ -203,7 +203,7 @@ void RebuildComponent::Update(float deltaTime) {
 
 			++m_DrainedImagination;
 
-			if (newImagination == 0 && m_DrainedImagination < m_TakeImagination) {
+			if (newImagination <= 0 && m_DrainedImagination < m_TakeImagination) {
 				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
 
 				break;