patch to lang-switching #186