diff --git a/PHI-CL/locale/en.cfg b/PHI-CL/locale/en/locale.cfg
similarity index 100%
rename from PHI-CL/locale/en.cfg
rename to PHI-CL/locale/en/locale.cfg
diff --git a/PHI-CL/locale/ja.cfg b/PHI-CL/locale/ja/locale.cfg
similarity index 100%
rename from PHI-CL/locale/ja.cfg
rename to PHI-CL/locale/ja/locale.cfg
diff --git a/PHI-CL/locale/zh-CN.cfg b/PHI-CL/locale/zh-CN/locale.cfg
similarity index 100%
rename from PHI-CL/locale/zh-CN.cfg
rename to PHI-CL/locale/zh-CN/locale.cfg
diff --git a/PHI-CL/locale/zh-TW.cfg b/PHI-CL/locale/zh-TW/locale.cfg
similarity index 100%
rename from PHI-CL/locale/zh-TW.cfg
rename to PHI-CL/locale/zh-TW/locale.cfg
diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua
index 2be69b5..5353ddf 100644
--- a/PHI-CL/main.lua
+++ b/PHI-CL/main.lua
@@ -397,8 +397,13 @@ end
 
 -- fast replace group
 function main.EL(source)
-    data.raw[source.type][source.ref_name].fast_replaceable_group = ((not data.raw[source.type][source.ref_name].fast_replaceable_group) and source.ref_name) or nil
-    data.raw[source.type][source.name .. '-' .. 2].fast_replaceable_group = (source.max > 2 and data.raw[source.type][source.ref_name].fast_replaceable_group) or nil
+    if not data.raw[source.type][source.ref_name].fast_replaceable_group then
+        data.raw[source.type][source.ref_name].fast_replaceable_group = source.ref_name
+    end
+
+    if source.max > 2 then
+        data.raw[source.type][source.name .. '-' .. 2].fast_replaceable_group = data.raw[source.type][source.ref_name].fast_replaceable_group
+    end
 
     if source.max > source.min then
         for j=source.min + 1, source.max do