Fix for Bug #3 passing the language code