Convert #623447 to Flügger