Convert #623235 to Flügger