diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index 3581efc37..c58e8eb11 100644
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -251,9 +251,9 @@ class FstabGenerator(object):
             return None
         if not mount_point:
             mount_point = "swap"
-        # Existing swap partitins should not be used
-        if filesystem == "swap" and not partition["new"]:
-            libcalamares.utils.debug("fstab ignoring old swap {}".format(disk_name))
+
+        if filesystem == "swap" and not partition.get("claimed", None):
+            libcalamares.utils.debug("Ignoring foreign swap {!s} {!s}".format(disk_name, partition.get("uuid", None)))
             return None
 
         options = self.get_mount_options(filesystem, mount_point)
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index 7faf67863..38a52249f 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -224,10 +224,10 @@ public:
      */
     QList< SummaryInfo > createSummaryInfo() const;
 
-    void dumpQueue() const; // debug output
-
     const OsproberEntryList osproberEntries() const;    // os-prober data structure, cached
 
+    void dumpQueue() const; // debug output
+
 Q_SIGNALS:
     void hasRootMountPointChanged( bool value );
     void isDirtyChanged( bool value );
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index c96687b82..c909ba913 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -100,15 +100,18 @@ mapForPartition( Partition* partition, const QString& uuid )
         map[ "fs" ] = untranslatedFS( dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() );
     }
     map[ "uuid" ] = uuid;
-    map[ "new" ] = partition->state() == Partition::StateNew;
+    map[ "claimed" ] = PartitionInfo::format( partition );  // If we formatted it, it's ours
 
     // Debugging for inside the loop in createPartitionList(),
     // so indent a bit
     Logger::CDebug deb;
     using TR = Logger::DebugRow< const char* const, const QString& >;
     deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode()
-        << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() )
-        << TR( "fsName", map[ "fsName" ].toString() ) << TR( "uuid", uuid );
+        << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) )
+        << TR( "fs:", map[ "fs" ].toString() )
+        << TR( "fsName", map[ "fsName" ].toString() )
+        << TR( "uuid", uuid )
+        << TR( "claimed", map[ "claimed" ].toString() );
 
     if ( partition->roles().has( PartitionRole::Luks ) )
     {