diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index 84d78cbc4c9c8dde52a9d991c24e89b44efa6d92..f83861004cb16e7726541ef8aefc61390d449a0d 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -1389,6 +1389,8 @@ def extract_clusters_description(clusters, site_name, options, data_hierarchy, s
           ############################################
           if core_numbering == 'contiguous'
             row[:cpuset] = cpu_num * cpu_core_count + core_num
+          elsif core_numbering == 'contiguous-including-threads'
+            row[:cpuset] = cpu_num * cpu_thread_count + core_num
           elsif core_numbering == 'round-robin'
             row[:cpuset] = cpu_num + core_num * cpu_count
           else