diff --git a/Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java b/Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java
index 064d03799..c09481871 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/commands/Download.java
@@ -41,8 +41,11 @@ public class Download extends SubCommand {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if ((!plot.isOwner(plr.getUUID()) || (Settings.DOWNLOAD_REQUIRES_DONE && plot.getFlag(Flags.DONE).isPresent())) && !Permissions
-                .hasPermission(plr, "plots.admin.command.download")) {
+        if ((Settings.DOWNLOAD_REQUIRES_DONE && (FlagManager.getPlotFlagRaw(plot, "done") == null)) && !Permissions.hasPermission(plr, "plots.admin.command.download")) {
+            MainUtil.sendMessage(plr, C.DONE_NOT_DONE);
+            return false;
+        }
+        if ((!plot.isOwner(plr.getUUID()))) {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
index e541f1dba..d81a2a23c 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
@@ -236,7 +236,6 @@ public abstract class EventUtil {
                     return true;
                 }
                 if (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock())) {
-                    // TODO: fix the commented dead code
                     return true; //!(!false || MainUtil.sendMessage(pp, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s() + "/" + C.FLAG_DEVICE_INTERACT.s()));
                 }
                 return true;