diff --git a/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt b/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
index 7e772b357..66fe35079 100644
--- a/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
+++ b/app/src/androidTest/java/com/kunzisoft/keepass/tests/template/TemplateAttributeOptionTest.kt
@@ -7,7 +7,7 @@ import org.junit.Assert
 class TemplateAttributeOptionTest: TestCase() {
 
     fun testSerializeOptions() {
-        val options = HashMap<String, String>().apply {
+        val options = TemplateAttributeOption().apply {
             put("TestA", "TestB")
             put("{D", "}C")
             put("E,gyu", "15,jk")
@@ -16,8 +16,9 @@ class TemplateAttributeOptionTest: TestCase() {
 
         val strings = TemplateAttributeOption.getStringFromOptions(options)
         val optionsAfterSerialization = TemplateAttributeOption.getOptionsFromString(strings)
+        val otherString = TemplateAttributeOption.getStringFromOptions(optionsAfterSerialization)
 
-        Assert.assertEquals("Output not equal to input", options, optionsAfterSerialization)
+        Assert.assertEquals("Output not equal to input", strings, otherString)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateAttributeOption.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateAttributeOption.kt
index 77873f310..4d8426f97 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateAttributeOption.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateAttributeOption.kt
@@ -124,7 +124,7 @@ class TemplateAttributeOption() : Parcelable {
         return mOptions[label]
     }
 
-    fun add(label: String, value: String) {
+    fun put(label: String, value: String) {
         mOptions[label] = value
     }
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngineCompatible.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngineCompatible.kt
index 6dccd86a5..e292e43da 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngineCompatible.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/template/TemplateEngineCompatible.kt
@@ -158,7 +158,7 @@ class TemplateEngineCompatible(database: DatabaseKDBX): TemplateEngine(database)
                         val attributeName = label.substring(TEMPLATE_ATTRIBUTE_OPTIONS_PREFIX.length)
                         val attribute = getOrRetrieveAttributeFromName(attributes, attributeName)
                         if (value.isNotEmpty()) {
-                            attribute.attribute.options.add(TEMPLATE_ATTRIBUTE_OPTIONS_TEMP, value)
+                            attribute.attribute.options.put(TEMPLATE_ATTRIBUTE_OPTIONS_TEMP, value)
                         }
                         entryCopy.removeField(field.name)
                     } catch (e: Exception) {