Convert #521636 to Flügger