Convert #521391 to Flügger