Convert #521490 to Flügger