Fixed locale handling