Convert #396837 to Flügger