#87 Cleaner solution, that respects the locale of the user