Convert #521614 to Flügger