Convert #623207 to Flügger