Thema 2: undo changes of @vkleibel