bugfix concerns for lang