Improvements for #2974 (german)