#354215 fixed LazyInitialization-problem that occured on languages and
refactored a bit