APD-263: Fixed locale set