Convert #623338 to Flügger