Convert #521585 to Flügger