Convert #623615 to Flügger