diff --git a/atdna/main.cpp b/atdna/main.cpp
index a4f66c7..be92d09 100644
--- a/atdna/main.cpp
+++ b/atdna/main.cpp
@@ -2418,6 +2418,7 @@ int main(int argc, const char** argv)
                                      "-D__atdna__=1",
                                      "-Wno-expansion-to-defined",
                                      "-Wno-nullability-completeness",
+                                     "-Werror=shadow-field",
                                      "-I" XSTR(INSTALL_PREFIX) "/lib/clang/" CLANG_VERSION_STRING "/include",
                                      "-I" XSTR(INSTALL_PREFIX) "/include/Athena"};
     for (int a=1 ; a<argc ; ++a)
diff --git a/src/athena/FileWriterNix.cpp b/src/athena/FileWriterNix.cpp
index 0ba5dbf..ed9e453 100644
--- a/src/athena/FileWriterNix.cpp
+++ b/src/athena/FileWriterNix.cpp
@@ -46,7 +46,10 @@ FileWriter::~FileWriter()
 void FileWriter::open(bool overwrite)
 {
     if (overwrite)
-        m_fileHandle = fopen(m_filename.c_str(), "w+b");
+    {
+        std::string tmpFilename = m_filename + '~';
+        m_fileHandle = fopen(tmpFilename.c_str(), "w+b");
+    }
     else
     {
         m_fileHandle = fopen(m_filename.c_str(), "a+b");
@@ -81,6 +84,9 @@ void FileWriter::close()
 
     fclose(m_fileHandle);
     m_fileHandle = NULL;
+
+    std::string tmpFilename = m_filename + '~';
+    rename(tmpFilename.c_str(), m_filename.c_str());
 }
 
 void FileWriter::seek(atInt64 pos, SeekOrigin origin)
diff --git a/src/athena/FileWriterWin32.cpp b/src/athena/FileWriterWin32.cpp
index 0195bb5..484a641 100644
--- a/src/athena/FileWriterWin32.cpp
+++ b/src/athena/FileWriterWin32.cpp
@@ -36,7 +36,8 @@ void FileWriter::open(bool overwrite)
     {
         if (overwrite)
         {
-            m_fileHandle = CreateFileW(m_filename.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE,
+            std::wstring tmpFilename = m_filename + L'~';
+            m_fileHandle = CreateFileW(tmpFilename.c_str(), GENERIC_WRITE, FILE_SHARE_WRITE,
                                        nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
         }
         else
@@ -72,6 +73,9 @@ void FileWriter::close()
     FlushFileBuffers(m_fileHandle);
     CloseHandle(m_fileHandle);
     m_fileHandle = 0;
+
+    std::wstring tmpFilename = m_filename + L'~';
+    MoveFileExW(tmpFilename.c_str(), m_filename.c_str(), MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH);
 }
 
 void FileWriter::seek(atInt64 pos, SeekOrigin origin)