diff --git a/src/main.cpp b/src/main.cpp
index 49246ec89..df5bca21e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -203,6 +203,9 @@ FIXME: Server sometimes goes into some infinite PeerNotFoundException loop
 TODO: Player health points
 	- When player dies, throw items on map
 
+FIXME: If something is removed from craftresult with a right click,
+	it is only possible to get one item from it should give 4
+
 Objects:
 --------
 
diff --git a/src/server.cpp b/src/server.cpp
index a70c42a35..7266a6ddf 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2741,9 +2741,19 @@ void Server::inventoryModified(InventoryContext *c, std::string id)
 		p.Y = stoi(fn.next(","));
 		p.Z = stoi(fn.next(","));
 		assert(c->current_player);
-		RemoteClient *client = getClient(c->current_player->peer_id);
 		v3s16 blockpos = getNodeBlockPos(p);
-		client->SetBlockNotSent(blockpos);
+
+		/*RemoteClient *client = getClient(c->current_player->peer_id);
+		client->SetBlockNotSent(blockpos);*/
+
+		for(core::map<u16, RemoteClient*>::Iterator
+			i = m_clients.getIterator();
+			i.atEnd()==false; i++)
+		{
+			RemoteClient *client = i.getNode()->getValue();
+			client->SetBlockNotSent(blockpos);
+		}
+
 		return;
 	}