bugfixes for the multi-lang version