Convert #341682 to Flügger