diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
index a22ab8e9..624c1caa 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
@@ -159,7 +159,7 @@ private List<String> tags() throws IOException {
     }
 
     private boolean clean() throws GitAPIException {
-        return GitUtil.status(repository).isClean();
+        return !GitUtil.status(repository).hasUncommittedChanges();
     }
 
     private GitDescription describe() throws IOException {
diff --git a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
index 5aed5d23..0fe9f243 100644
--- a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
+++ b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
@@ -34,11 +35,11 @@ void status_clean() throws GitAPIException {
         Status status = GitUtil.status(git.getRepository());
 
         // then
-        assertThat(status.isClean()).isTrue();
+        assertThat(status.hasUncommittedChanges()).isFalse();
     }
 
     @Test
-    void status_dirty() throws GitAPIException, IOException {
+    void status_clean_untrackedFile() throws GitAPIException, IOException {
 
         // given
         Git git = Git.init().setInitialBranch(MASTER).setDirectory(tempDir.toFile()).call();
@@ -50,7 +51,34 @@ void status_dirty() throws GitAPIException, IOException {
         Status status = GitUtil.status(git.getRepository());
 
         // then
-        assertThat(status.isClean()).isFalse();
+        assertThat(status.getUntracked()).contains("README.md");
+        assertThat(status.hasUncommittedChanges()).isFalse();
+    }
+
+    @Test
+    void status_dirty_modifiedFile() throws GitAPIException, IOException {
+
+        // given
+        Git git = Git.init().setInitialBranch(MASTER).setDirectory(tempDir.toFile()).call();
+
+        File dummyFile = new File(tempDir.toFile(), "README.md");
+        boolean dummyFileCreated = dummyFile.createNewFile();
+        assertThat(dummyFileCreated).isTrue();
+
+        git.add().addFilepattern("README.md").call();
+        git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+
+        try (FileWriter writer = new FileWriter(dummyFile)) {
+            writer.write("Hello World!");
+            writer.flush();
+        }
+
+        // when
+        Status status = GitUtil.status(git.getRepository());
+
+        // then
+        assertThat(status.getModified()).contains("README.md");
+        assertThat(status.hasUncommittedChanges()).isTrue();
     }
 
     @Test