diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
index 4b8ec08..f58dc23 100644
--- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset
+++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81bad35bf8880695b93bf905b8c2b54f945c47d82b169c2ea69aa092857e15e1
-size 63760
+oid sha256:ff64a97aeb5d12435a02c4bd605bffe6ba3cf27a0a8de71e2903fdb42a622c25
+size 63137
diff --git a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset
index b1a1752..cb0fa3a 100644
--- a/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset
+++ b/Content/Blueprints/Merchant/Merchant_UI/BP_OPENDIAL.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b00c78b227e5926f654f4ae7c1421f83cc57c4a186be20147347e9b694ffe960
-size 71363
+oid sha256:5aba7e76546797d974d8c1fbb2f989416f27912dbd289acc8c16a5bc5b25eefd
+size 70965
diff --git a/Content/Levels/MerchantPrototype.umap b/Content/Levels/MerchantPrototype.umap
index fd3c5f2..7a9a334 100644
--- a/Content/Levels/MerchantPrototype.umap
+++ b/Content/Levels/MerchantPrototype.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffe4d674bcfb45a2e8b4f2a05aa88a647f4f5a5d6726d037573cbbb4769b3697
+oid sha256:676563d739d9464ad55d9e31bd059f81dccf2250864c3c7bda445ea682e0083d
 size 27106
diff --git a/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h b/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h
index c650652..fc376ff 100644
--- a/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h
+++ b/Source/the_twilight_abyss/InteractableEnvironment/InteractableEnvironmentObject.h
@@ -24,7 +24,7 @@ public:
 	// Called every frame
 	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
 
-	UPROPERTY(EditDefaults)
+	UPROPERTY(EditDefaultsOnly)
 	bool bInteractable = false;
 
 	UFUNCTION(Blueprintcallable)
diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
index e74b47a..5b6bf51 100644
--- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
+++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
@@ -77,13 +77,14 @@ void ATempCharacter::LineTraceLogic()
 	if (bHit)
 	{
 		//we store the GetItem function from InventoryComponent into ItemArray variable
-		auto ItemArray = OutHit.GetActor()->FindComponentByClass<UInventoryComponent>()->GetItem(0);
+		
 		if(OutHit.GetActor() == nullptr)
 		{
 			return;
 		}
 		if(OutHit.GetActor()->FindComponentByClass<UInventoryComponent>())
 		{
+			auto ItemArray = OutHit.GetActor()->FindComponentByClass<UInventoryComponent>()->GetItem(0);
 			if(GoldBalance >= ItemArray->ItemCostPrice)
 			{
 				GoldBalance -= ItemArray->ItemCostPrice;