diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
index f8cab9d..ded5f94 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/PropertyHandler.java
@@ -279,4 +279,8 @@
             this.field = f;
         }
     }
+
+    public void clear() {
+        this.properties.clear();
+    }
 }
diff --git a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java b/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
index b36bc95..94e3d04 100644
--- a/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
+++ b/scrplugin/src/main/java/org/apache/felix/scrplugin/SCRDescriptorMojo.java
@@ -226,6 +226,7 @@
 
         // collect references from class tags and fields
         final Map references = new HashMap();
+        this.propertyHandler.clear();
 
         JavaClassDescription currentDescription = description;
         do {