Convert #623497 to Flügger