Convert #417882 to Flügger