Convert #652371 to Flügger