Convert #611971 to Flügger