diff --git a/rollback_module.sh b/rollback_module.sh
index b937132..7278c29 100755
--- a/rollback_module.sh
+++ b/rollback_module.sh
@@ -90,7 +90,8 @@ function rebuild_txt {
         echo "${eventArray[${index}]}" >> "${TXT}"
         for key in "${sorted[@]}"; do
             # We work only on key related to our current event
-            if [[ "${key}" == "${index}"* ]]; then
+            # We need to compare key to the event id in index, ie the first part of the key (see #7)
+            if [[ "${key/.*/}" == "${index}" ]]; then
                 eventID="${index}"
                 nodeID="$(awk -F'.' '{print $2}' <<< ${key})"
                 type="$(awk -F'.' '{print $3}' <<< ${key})"