Convert #321585 to Flügger