diff --git a/src/QRCode.php b/src/QRCode.php
index 0287cd06e..97a8bb851 100755
--- a/src/QRCode.php
+++ b/src/QRCode.php
@@ -156,7 +156,7 @@ class QRCode{
 
 		$maskPattern = $this->options->maskPattern === $this::MASK_PATTERN_AUTO
 			? $this->getBestMaskPattern()
-			: min(7, max(0, (int)$this->options->maskPattern));
+			: $this->options->maskPattern;
 
 		$matrix = $this->dataInterface->initMatrix($maskPattern);
 
diff --git a/src/QROptionsTrait.php b/src/QROptionsTrait.php
index e86a65e3b..1bc1abab0 100644
--- a/src/QROptionsTrait.php
+++ b/src/QROptionsTrait.php
@@ -251,6 +251,10 @@ trait QROptionsTrait{
 		$min = $this->versionMin;
 		$this->versionMin = (int)min($min, $max);
 		$this->versionMax = (int)max($min, $max);
+
+		if($this->maskPattern !== QRCode::MASK_PATTERN_AUTO){
+			$this->maskPattern = min(7, max(0, (int)$this->maskPattern));
+		}
 	}
 
 }