diff --git a/src/ChessArbiter.cpp b/src/ChessArbiter.cpp
index 57f280f..fe83662 100644
--- a/src/ChessArbiter.cpp
+++ b/src/ChessArbiter.cpp
@@ -309,12 +309,16 @@ std::vector<std::string> ChessArbiter::ListLegalMoves(bool isBlack) {
     bool IsDstEmpty = board.IsEmpty(dst);
 
     // Pawns side  moves
-    if ((srcp.piece == 'p' || srcp.piece == 'P') && (src[0] != dst[0])) {
-      if (!IsDstEmpty) {
-        Piece attacked = board.GetPieceAt(dst);
-        if (srcp.isBlack != attacked.isBlack)
+    if (srcp.piece == 'p' || srcp.piece == 'P') {
+      if ((src[0] != dst[0])) {
+        if (!IsDstEmpty) {
+          Piece attacked = board.GetPieceAt(dst);
+          if (srcp.isBlack != attacked.isBlack)
+            moves.push_back(move);
+        } else if (dst == fen.en_passant) {
           moves.push_back(move);
-      } else if (dst == fen.en_passant) {
+        }
+      } else if (IsDstEmpty) {
         moves.push_back(move);
       }
     } else {
diff --git a/tests/chessarbiter.cpp b/tests/chessarbiter.cpp
index 354f3f1..868ea2c 100644
--- a/tests/chessarbiter.cpp
+++ b/tests/chessarbiter.cpp
@@ -450,4 +450,7 @@ TEST_CASE("ParseSAN", "[ParseSAN]") {
   a.Setup(
       "r1bq1rk1/p4ppp/2p2n2/1pbPp3/3n4/P1NB3P/1PPP1PPN/R1BQ1RK1 b - - 0 10");
   CHECK(a.ParseSAN("exd5") == "c6d5");
+
+  a.Setup("rnbqkbnr/pp3ppp/4p3/2pp4/3PP3/8/PPPN1PPP/R1BQKBNR w KQkq - 0 4");
+  CHECK(a.ParseSAN("exd5") == "e4d5");
 }