diff --git a/code/ryzom/common/data_common/r2/r2_features_default.lua b/code/ryzom/common/data_common/r2/r2_features_default.lua
index d64113c93..70d129380 100644
--- a/code/ryzom/common/data_common/r2/r2_features_default.lua
+++ b/code/ryzom/common/data_common/r2/r2_features_default.lua
@@ -371,7 +371,7 @@ local registerFeature = function ()
 					--------------------
 					convertToWidgetValue = 
 					function(value)						
-						local result = math.mod(math.floor(180 * value / math.pi), 360)
+						local result = math.fmod(math.floor(180 * value / math.pi), 360)
 						if result < 0 then result = 360 + result end
 						return result
 					end,
diff --git a/code/ryzom/common/data_common/r2/r2_features_easter_egg.lua b/code/ryzom/common/data_common/r2/r2_features_easter_egg.lua
index 3756d0abe..76b185f8b 100644
--- a/code/ryzom/common/data_common/r2/r2_features_easter_egg.lua
+++ b/code/ryzom/common/data_common/r2/r2_features_easter_egg.lua
@@ -78,7 +78,7 @@ feature.Components.EasterEgg =
 				function(value)
 					local angle = value
 					if angle == nil then angle = 0 end						
-					local result = math.mod(math.floor(180 * angle / math.pi), 360)
+					local result = math.fmod(math.floor(180 * angle / math.pi), 360)
 					if result < 0 then result = 360 + result end
 					return result
 				end,
diff --git a/code/ryzom/common/data_common/r2/r2_ui_char_tracking.lua b/code/ryzom/common/data_common/r2/r2_ui_char_tracking.lua
index 431e93918..aa92ed669 100644
--- a/code/ryzom/common/data_common/r2/r2_ui_char_tracking.lua
+++ b/code/ryzom/common/data_common/r2/r2_ui_char_tracking.lua
@@ -635,7 +635,7 @@ function CharTracking:onDraw()
 			self.LastRefreshTime = nltime.getLocalTime() / 1000
 			--self:getWindow():find("refreshText").active = false
 		else	
-			local waitText = i18n.get("uiRAP_WaitChars" .. math.mod(os.time(), 3))
+			local waitText = i18n.get("uiRAP_WaitChars" .. math.fmod(os.time(), 3))
 			self:setInfoMessage(waitText)			
 			--local refreshText = self:getWindow():find("refreshText")
 			--if not self.ListReceived then
diff --git a/code/ryzom/common/data_common/r2/r2_ui_player_tracking.lua b/code/ryzom/common/data_common/r2/r2_ui_player_tracking.lua
index e64ca7164..b9f6a3672 100644
--- a/code/ryzom/common/data_common/r2/r2_ui_player_tracking.lua
+++ b/code/ryzom/common/data_common/r2/r2_ui_player_tracking.lua
@@ -613,7 +613,7 @@ function PlayerTracking:onDraw()
 		
 	local timeInSec = nltime.getLocalTime() / 1000
 	if self.WaitingList then		
-		local waitText = i18n.get("uiRAP_WaitMsg" .. math.mod(os.time(), 3))
+		local waitText = i18n.get("uiRAP_WaitMsg" .. math.fmod(os.time(), 3))
 		if not self.ListReceived then
 			self:setInfoMessage(waitText)
 			waitTextColor.A = 127 + 127 * (0.5 + 0.5 * math.cos(6 * timeInSec))