Convert #521637 to Flügger