Convert #328376 to Flügger