Prepare to handle locale better. re #37