Convert #328615 to Flügger