Added default language fix (Thanks to @DS-Matt) REF: #1405