Convert #541697 to Flügger