Improvement to L18n!