Convert #521670 to Flügger