diff --git a/rfswarm_agent/rfswarm_agent.py b/rfswarm_agent/rfswarm_agent.py
index 9c72a980c..1f59a3657 100644
--- a/rfswarm_agent/rfswarm_agent.py
+++ b/rfswarm_agent/rfswarm_agent.py
@@ -1485,7 +1485,7 @@ def create_repeater_listner_file(self):
 		fd.append("				jobdata = json.load(f)")
 		fd.append("")
 		fd.append("		self.count += 1")
-		fd.append("		newiteration = \"{}.{}\".format(test.parent.metadata['RFS_ITERATION'], self.count)")
+		fd.append("		newiteration = \"{}_{}\".format(test.parent.metadata['RFS_ITERATION'], self.count)")
 		fd.append("		BuiltIn().set_suite_variable(\"${RFS_ITERATION}\", newiteration)")
 		fd.append("")
 		fd.append("		if int(time.time()) < jobdata[\"EndTime\"]:")
diff --git a/rfswarm_manager/rfswarm.py b/rfswarm_manager/rfswarm.py
index 0c9d773b1..0c116c474 100644
--- a/rfswarm_manager/rfswarm.py
+++ b/rfswarm_manager/rfswarm.py
@@ -805,7 +805,7 @@ def ensure_db(self):
 				# create tables
 
 				c.execute('''CREATE TABLE Results
-					(script_index int, robot int, iteration real, agent text, sequence int, result_name text, result text, elapsed_time num, start_time num, end_time num)''')
+					(script_index int, robot int, iteration text, agent text, sequence int, result_name text, result text, elapsed_time num, start_time num, end_time num)''')
 
 				c.execute('''CREATE TABLE Metric
 					(ID INTEGER, Name TEXT NOT NULL, Type TEXT NOT NULL, PRIMARY KEY("ID"))''')