diff --git a/src/kits/locale/LocaleRosterData.cpp b/src/kits/locale/LocaleRosterData.cpp
index 5511432200..c6f5300f2c 100644
--- a/src/kits/locale/LocaleRosterData.cpp
+++ b/src/kits/locale/LocaleRosterData.cpp
@@ -165,8 +165,12 @@ LocaleRosterData::Refresh()
 int
 LocaleRosterData::CompareInfos(const void* left, const void* right)
 {
-	return ((CatalogAddOnInfo*)right)->fPriority
-		- ((CatalogAddOnInfo*)left)->fPriority;
+	const CatalogAddOnInfo* leftInfo
+		= * static_cast<const CatalogAddOnInfo* const *>(left);
+	const CatalogAddOnInfo* rightInfo
+		= * static_cast<const CatalogAddOnInfo* const *>(right);
+
+	return leftInfo->fPriority - rightInfo->fPriority;
 }