Fixed #1604: changing languages and reloading work better now.