Use locale helper
Fix conflict