Include the locale state and make the command a touch safer