diff --git a/src/main/java/com/comandante/creeper/command/BackCommand.java b/src/main/java/com/comandante/creeper/command/BackCommand.java
index e7fa4d66209a28dc4df4fd1533b7b557c1b10e74..c15120bdf0cd3884173fc9e7889916899e0b8aa5 100644
--- a/src/main/java/com/comandante/creeper/command/BackCommand.java
+++ b/src/main/java/com/comandante/creeper/command/BackCommand.java
@@ -22,6 +22,10 @@ public class BackCommand extends Command {
     @Override
     public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
         execCommand(ctx, e, () -> {
+            if (player.isActiveFights()) {
+                write("You can't move while in a fight!");
+                return;
+            }
             Room returnRoom = player.getPreviousRoom();
             player.removeActiveAlertStatus();
             PlayerMovement playerMovement = new PlayerMovement(player, currentRoom.getRoomId(), returnRoom.getRoomId(), "fleed to where they came from.", "up");
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 2dcfb547e9241c3e6534f4412bd3a4ca42f36ad5..be4d5200268e26d7dd1d676a0668526a31f43479 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -726,12 +726,7 @@ public class Player extends CreeperEntity {
                     inventoryItems.add(itemEntity);
                 }
             }
-            Collections.sort(inventoryItems, new Comparator<Item>() {
-                @Override
-                public int compare(final Item object1, final Item object2) {
-                    return object1.getItemName().compareTo(object2.getItemName());
-                }
-            });
+            Collections.sort(inventoryItems, (a, b) -> a.getItemName().compareTo(b.getItemName()));
             return inventoryItems;
         }
     }