diff --git a/src/de/steamwar/command/AbstractValidator.java b/src/de/steamwar/command/AbstractValidator.java
index b0340e3..aab4876 100644
--- a/src/de/steamwar/command/AbstractValidator.java
+++ b/src/de/steamwar/command/AbstractValidator.java
@@ -50,7 +50,12 @@ public interface AbstractValidator<K, T> {
         private boolean valid = true;
 
         public <M> Validator<M> map(Function<C, M> mapper) {
-            return new Validator<>(mapper.apply(value), messageSender).and(ignore -> valid);
+            return new Validator<>(mapper.apply(value), messageSender).set(valid);
+        }
+
+        public Validator<C> set(boolean value) {
+            this.valid = value;
+            return this;
         }
 
         public Validator<C> and(Predicate<C> predicate) {