Convert #521579 to Flügger