diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
index db8b1755..c5cfd299 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
@@ -229,19 +229,16 @@ abstract class Chunk<WorldType : World<WorldType, This>, This : Chunk<WorldType,
 	}
 
 	protected open fun foregroundChanges(x: Int, y: Int, cell: ImmutableCell) {
-		cellChanges(x, y, cell)
 		tileChangeset++
 		foregroundChangeset++
 	}
 
 	protected open fun backgroundChanges(x: Int, y: Int, cell: ImmutableCell) {
-		cellChanges(x, y, cell)
 		tileChangeset++
 		backgroundChangeset++
 	}
 
 	protected open fun liquidChanges(x: Int, y: Int, cell: ImmutableCell) {
-		cellChanges(x, y, cell)
 		liquidChangeset++
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileModification.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileModification.kt
index 3450c0d6..e20b9570 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileModification.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/TileModification.kt
@@ -225,8 +225,8 @@ sealed class TileModification {
 		}
 
 		override fun apply(world: World<*, *>, position: Vector2i, allowEntityOverlap: Boolean) {
-			val cell = world.getCell(position)
-			val tile = cell.tile(isBackground).mutable()
+			val cell = world.getCell(position).mutable()
+			val tile = cell.tile(isBackground)
 			tile.hueShift = 0f
 			tile.color = this.color
 			world.setCell(position, cell)