Bugfix: i18n not working correctly