Convert #623479 to Flügger