Convert #623588 to Flügger