diff --git a/src/map.cpp b/src/map.cpp
index dc4459263..9d67c8282 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1564,6 +1564,11 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
 
 	while(m_transforming_liquid.size() != 0)
 	{
+		// This should be done here so that it is done when continue is used
+		if(loopcount >= initial_size * 3)
+			break;
+		loopcount++;
+
 		/*
 			Get a queued transforming liquid node
 		*/
@@ -1779,12 +1784,6 @@ void Map::transformLiquids(core::map<v3s16, MapBlock*> & modified_blocks)
 				}
 				break;
 		}
-		
-		loopcount++;
-		//if(loopcount >= 100000)
-		if(loopcount >= initial_size * 10) {
-			break;
-		}
 	}
 	//dstream<<"Map::transformLiquids(): loopcount="<<loopcount<<std::endl;
 }