Convert #397571 to Flügger