Bug fix in binary and also i18n support.