diff --git a/MavenChess/MavenChess/src/main/java/controller/Main.java b/MavenChess/MavenChess/src/main/java/controller/Main.java
index c1f195760832a964402094c0ae1839c8c7753de5..0bc61bb550ea68f6d2c3ee076f996840e60de5d7 100644
--- a/MavenChess/MavenChess/src/main/java/controller/Main.java
+++ b/MavenChess/MavenChess/src/main/java/controller/Main.java
@@ -162,24 +162,24 @@ public class Main extends Application {
 	}
 
 	public void clickTile(TileView clickedTile) {
-		// --- Resets enPassant ---
-		for(int j = 1 ; j <= 8 ; j++) {
-			for(int i = 1 ; i <= 8 ; i++) {
-				Position p = new Position(i, j);
-				if (board.isPawn(p)) {
-					((Pawn) board.getPiece(p)).setEnPassant(false);
-				}
-				if (board.isNwap(p)) {
-					((Nwap) board.getPiece(p)).setEnPassant(false);
-				}
-			}
-		}
 
 		// --- Analyses the clicked tile type, and executes related actions ---
 		int state = clickedTile.getState();
 		Position selected = board.getSelected();
 		Position arrival = clickedTile.getPosition();
 		if(state != TileView.NORMAL && state != TileView.SELECTED) {
+			// --- Resets enPassant ---
+			for(int j = 1 ; j <= 8 ; j++) {
+				for(int i = 1 ; i <= 8 ; i++) {
+					Position p = new Position(i, j);
+					if (board.isPawn(p)) {
+						((Pawn) board.getPiece(p)).setEnPassant(false);
+					}
+					if (board.isNwap(p)) {
+						((Nwap) board.getPiece(p)).setEnPassant(false);
+					}
+				}
+			}
 			// --- ALL SPECIAL MOVES ---
 			if(state == TileView.SPECIAL) {
 				if(board.isPawn(selected) || board.isNwap(selected)) {
diff --git a/MavenChess/MavenChess/target/classes/controller/Main.class b/MavenChess/MavenChess/target/classes/controller/Main.class
index 8d4ad131fcbb83edbee5e5d469a9676cc242489a..b3df3d8666f86150ecee53900be5105cf57c6643 100644
Binary files a/MavenChess/MavenChess/target/classes/controller/Main.class and b/MavenChess/MavenChess/target/classes/controller/Main.class differ