Fixed bug related to locale