Convert #406979 to Flügger