** Fixed locale issue