Convert #417406 to Flügger