Convert #328241 to Flügger