Convert #521981 to Flügger