Convert #623685 to Flügger