Convert #417657 to Flügger