diff --git a/res/spritesheets.properties b/res/spritesheets.properties
index ea5cffd..cd088ab 100644
--- a/res/spritesheets.properties
+++ b/res/spritesheets.properties
@@ -51,11 +51,12 @@ atcs.spritesheet.monsters_eye1.category=monster
 atcs.spritesheet.monsters_eye2.category=monster
 atcs.spritesheet.monsters_eye3.category=monster
 atcs.spritesheet.monsters_eye4.category=monster
-
 atcs.spritesheet.monsters_fatboy73.category=monster
 atcs.spritesheet.monsters_ghost1.category=monster
+
 atcs.spritesheet.monsters_gisons.category=monster
 atcs.spritesheet.monsters_guynmart.category=monster
+
 atcs.spritesheet.monsters_insects.category=monster
 atcs.spritesheet.monsters_karvis1.category=monster
 atcs.spritesheet.monsters_karvis2.category=monster
@@ -84,7 +85,6 @@ atcs.spritesheet.monsters_skeleton1.category=monster
 atcs.spritesheet.monsters_skeleton2.category=monster
 atcs.spritesheet.monsters_snakes.category=monster
 atcs.spritesheet.monsters_tometik1.category=monster
-atcs.spritesheet.monsters_tometik10.category=monster
 atcs.spritesheet.monsters_tometik2.category=monster
 atcs.spritesheet.monsters_tometik3.category=monster
 atcs.spritesheet.monsters_tometik4.category=monster
@@ -93,6 +93,7 @@ atcs.spritesheet.monsters_tometik6.category=monster
 atcs.spritesheet.monsters_tometik7.category=monster
 atcs.spritesheet.monsters_tometik8.category=monster
 atcs.spritesheet.monsters_tometik9.category=monster
+atcs.spritesheet.monsters_tometik10.category=monster
 atcs.spritesheet.monsters_warrior1.category=monster
 atcs.spritesheet.monsters_unknown.category=monster
 atcs.spritesheet.monsters_wraiths.category=monster
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
index 708c37b..cbd886f 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
@@ -2052,7 +2052,8 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
 					area.quantity = (Integer) value;
 				}
 			} else if (source == respawnSpeedField) {
-				if (selectedMapObject instanceof SpawnArea area) {
+				if (selectedMapObject instanceof SpawnArea) {
+					SpawnArea area = (SpawnArea) selectedMapObject;					
 					area.respawnSpeed = (Integer) value;
 				}
 			} else if (source == spawnActiveForNewGame) {
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java b/src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java
index 8601a9c..786282c 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/sprites/SpriteChooser.java
@@ -108,6 +108,7 @@ public class SpriteChooser extends JDialog {
 		int i;
 		Image img;
 		group = new ButtonGroup();
+		//For every sprite find a free space in panel:
 		for (Spritesheet sheet : spritesheets) {
 			i = 0;
 			while ((img = sheet.getImage(i)) != null) {
@@ -131,14 +132,20 @@ public class SpriteChooser extends JDialog {
 							for (int y = c.gridy; y < c.gridy + c.gridwidth; y++) {
 								if (reservedSlots.contains(new Point(x, y))) {
 									slotOk = false;
+									break;
 								}
 							}
+							if (!slotOk) {
+								break;
+							}
 						}
-						if (slotOk && c.gridx + c.gridwidth > MAX_PER_ROW) {
+						if (c.gridx + c.gridwidth > MAX_PER_ROW) {
 							c.gridx = 0;
 							c.gridy++;
 							slotOk = false;
-						}
+						} else if (!slotOk) {
+							c.gridx++;
+						}						
 					}
 					pane.add(button, c);
 					for (int x = c.gridx; x < c.gridx + c.gridwidth; x++) {