diff --git a/source/Entities/Player.cpp b/source/Entities/Player.cpp
index ffd829663..2e4199629 100644
--- a/source/Entities/Player.cpp
+++ b/source/Entities/Player.cpp
@@ -318,7 +318,7 @@ void cPlayer::SetTouchGround(bool a_bTouchGround)
 				(BlockType == E_BLOCK_STATIONARY_WATER) ||
 				(BlockType == E_BLOCK_LADDER) ||
 				(BlockType == E_BLOCK_VINES)
-				)
+			)
 			{
 				m_LastGroundHeight = (float)GetPosY();
 			}
diff --git a/source/Items/ItemBow.h b/source/Items/ItemBow.h
index 1add0dc6d..7bce127b1 100644
--- a/source/Items/ItemBow.h
+++ b/source/Items/ItemBow.h
@@ -71,7 +71,11 @@ public:
 			return;
 		}
 		a_Player->GetWorld()->BroadcastSpawnEntity(*Arrow);
-		a_Player->UseEquippedItem();
+
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->UseEquippedItem();
+		}
 	}
 } ;