diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
index 9675acba7..eadca9221 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -683,26 +683,29 @@ public class GameScene extends PixelScene {
 
 		float pos = scene.toolbar.top();
 
-		scene.attack.setPos( tagLeft, pos - scene.attack.height());
-		scene.attack.flip(tagLeft == 0);
+		//FIXME adjusting this to position even without visibility resulted in deadlocks
 		if (scene.tagAttack){
+			scene.attack.setPos( tagLeft, pos - scene.attack.height());
+			scene.attack.flip(tagLeft == 0);
 			pos = scene.attack.top();
 		}
 
-		scene.loot.setPos( tagLeft, pos - scene.loot.height() );
-		scene.loot.flip(tagLeft == 0);
 		if (scene.tagLoot) {
+			scene.loot.setPos( tagLeft, pos - scene.loot.height() );
+			scene.loot.flip(tagLeft == 0);
 			pos = scene.loot.top();
 		}
 
-		scene.action.setPos( tagLeft, pos - scene.action.height() );
-		scene.action.flip(tagLeft == 0);
 		if (scene.tagAction) {
+			scene.action.setPos( tagLeft, pos - scene.action.height() );
+			scene.action.flip(tagLeft == 0);
 			pos = scene.action.top();
 		}
 
-		scene.resume.setPos( tagLeft, pos - scene.resume.height() );
-		scene.resume.flip(tagLeft == 0);
+		if (scene.tagResume) {
+			scene.resume.setPos(tagLeft, pos - scene.resume.height());
+			scene.resume.flip(tagLeft == 0);
+		}
 	}
 	
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
index fea89505d..3a8993223 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java
@@ -33,6 +33,7 @@ import com.watabou.utils.Random;
 
 import java.util.ArrayList;
 
+//FIXME needs a refactor, lots of weird thread interaction here.
 public class AttackIndicator extends Tag {
 	
 	private static final float ENABLED	= 1.0f;